diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f4bedd..9c1b87a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ build: extends: .parallel rules: - if: $CI_COMMIT_TAG - - if: $CI_MERGE_REQUEST_TITLE !~ /^Draft/ + - if: $CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE !~ /^Draft/ - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" artifacts: paths: @@ -52,7 +52,7 @@ test: - TARGET: unstable rules: - if: $CI_COMMIT_TAG - - if: $CI_MERGE_REQUEST_TITLE !~ /^Draft/ + - if: $CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE !~ /^Draft/ - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" artifacts: paths: @@ -78,6 +78,7 @@ publish-images: rules: - if: $CI_COMMIT_TAG - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" + - when: never artifacts: paths: - tarballs/ @@ -101,6 +102,7 @@ make-documents: rules: - if: $CI_COMMIT_TAG - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" + - when: never artifacts: paths: - versions/* @@ -117,6 +119,7 @@ publish-documents: rules: - if: $CI_COMMIT_TAG - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" + - when: never artifacts: paths: - documentations/*.md @@ -131,6 +134,7 @@ weekly-build-disable: - make unschedule-weekly-build rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" + - when: never weekly-build-scheduler: @@ -141,15 +145,17 @@ weekly-build-scheduler: - make schedule-weekly-build rules: - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build-scheduler" + - when: never artifacts: reports: metrics: metrics.txt code_quality: rules: - - if: $CI_MERGE_REQUEST_TITLE !~ /^Draft/ + - if: $CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE !~ /^Draft/ + - when: never semgrep-sast: rules: - - if: $CI_MERGE_REQUEST_TITLE !~ /^Draft/ - + - if: $CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE !~ /^Draft/ + - when: never diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f85295..60900eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - + + +## [3.4.0] - 2024-09-24 +### Added +- Explicit project name to mock Docker Compose. +### Fixed +- Librairies name are formatted to lower case (#75). +- Use for $TARGET in mock Docker Compose. +- Fix pipeline jobs rules, specifically on Draft MR. + +[3.4.0]: https://gitlab.com/flrnnc-oss/docker-seafile-client/-/releases/3.4.0 + + -## [3.3.0] +## [3..0] ### Modified * Add TARGET environment variable to Makefile commands. ### Fixed diff --git a/seafile-client/entrypoint-docker.sh b/seafile-client/entrypoint-docker.sh index a9af74b..641e0e3 100755 --- a/seafile-client/entrypoint-docker.sh +++ b/seafile-client/entrypoint-docker.sh @@ -27,11 +27,11 @@ usermod -u $UID -g $GID seafile &> /dev/null if [ "$IMAGE" == "flowgunso" ]; then echo echo -e "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓" - echo -e "┃ \e[1mPlease use \e[4mflrnnc/seafile-client\e[24m instead of \e[4mflowgunso/seafile-client\e[24m which will be deprecated...\e[0m ┃" + echo -e "┃ \e[1mPlease use \e[4mflrnnc/seafile-client\e[24m instead of \e[4mflowgunso/seafile-client\e[24m which will be deprecated...\e[0m ┃" echo -e "┃ See the information notices at: ┃" - echo -e "┃ \thttps://forum.seafile.com/t/docker-client-to-sync-files-with-containers/8573 ┃" - echo -e "┃ \thttps://gitlab.com/flrnnc-oss/docker-seafile-client ┃" - echo -e "┃ \thttps://hub.docker.com/r/flowgunso/seafile-client ┃" + echo -e "┃ \thttps://forum.seafile.com/t/docker-client-to-sync-files-with-containers/8573 ┃" + echo -e "┃ \thttps://gitlab.com/flrnnc-oss/docker-seafile-client ┃" + echo -e "┃ \thttps://hub.docker.com/r/flowgunso/seafile-client ┃" echo -e "┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛" echo fi diff --git a/seafile-client/entrypoint-seafile.py b/seafile-client/entrypoint-seafile.py index b4ca8ec..5c381b7 100755 --- a/seafile-client/entrypoint-seafile.py +++ b/seafile-client/entrypoint-seafile.py @@ -110,7 +110,7 @@ class Client: if variable.startswith("SEAF_LIBRARY"): # Get the variable name. - name = variable.split("_")[2] + name = variable.split("_")[2].lower() # Read the password as a secret. if "_PASSWORD" in variable: diff --git a/tests/mock/compose.yaml b/tests/mock/compose.yaml index a2bec32..4bbf8b0 100644 --- a/tests/mock/compose.yaml +++ b/tests/mock/compose.yaml @@ -1,3 +1,5 @@ +name: mock-docker-seafile-client + services: mariadb: image: mariadb:10.11 @@ -31,7 +33,7 @@ services: - memcached client: - image: seafile-client:oldstable-flowgunso + image: seafile-client:${TARGET}-flowgunso volumes: #- library:/library - data:/seafile