Merge branch '75-libraries-name-fetched-from-the-environment-variables-are-not-formatted-to-lower-case' into 'master'

Format librairies name fetched from envvars to lower case.

Closes #75

See merge request flrnnc-oss/docker-seafile-client!22
This commit is contained in:
Florian Anceau
2024-09-24 11:32:25 +00:00
5 changed files with 37 additions and 16 deletions

View File

@@ -28,7 +28,7 @@ build:
extends: .parallel extends: .parallel
rules: rules:
- if: $CI_COMMIT_TAG - 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" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build"
artifacts: artifacts:
paths: paths:
@@ -52,7 +52,7 @@ test:
- TARGET: unstable - TARGET: unstable
rules: rules:
- if: $CI_COMMIT_TAG - 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" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build"
artifacts: artifacts:
paths: paths:
@@ -78,6 +78,7 @@ publish-images:
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build"
- when: never
artifacts: artifacts:
paths: paths:
- tarballs/ - tarballs/
@@ -101,6 +102,7 @@ make-documents:
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build"
- when: never
artifacts: artifacts:
paths: paths:
- versions/* - versions/*
@@ -117,6 +119,7 @@ publish-documents:
rules: rules:
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build"
- when: never
artifacts: artifacts:
paths: paths:
- documentations/*.md - documentations/*.md
@@ -131,6 +134,7 @@ weekly-build-disable:
- make unschedule-weekly-build - make unschedule-weekly-build
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build"
- when: never
weekly-build-scheduler: weekly-build-scheduler:
@@ -141,15 +145,17 @@ weekly-build-scheduler:
- make schedule-weekly-build - make schedule-weekly-build
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build-scheduler" - if: $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULED_PIPELINE == "weekly-build-scheduler"
- when: never
artifacts: artifacts:
reports: reports:
metrics: metrics.txt metrics: metrics.txt
code_quality: code_quality:
rules: rules:
- if: $CI_MERGE_REQUEST_TITLE !~ /^Draft/ - if: $CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE !~ /^Draft/
- when: never
semgrep-sast: semgrep-sast:
rules: rules:
- if: $CI_MERGE_REQUEST_TITLE !~ /^Draft/ - if: $CI_MERGE_REQUEST_ID && $CI_MERGE_REQUEST_TITLE !~ /^Draft/
- when: never

View File

@@ -7,8 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
<!-- To log a new version, copy, uncomment, add your changes, then add the tag shortcut at the end of the file --> <!-- To log a new version, copy, uncomment, add your changes, then add the tag shortcut at the end of the file -->
<!-- tag --/> <!-- Unreleased --/>
## [tag] ## [Unreleased] - year-month-date
### Added ### Added
### Changed ### Changed
### Deprecated ### Deprecated
@@ -16,11 +16,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
### Security ### Security
[tag]: https://gitlab.com/flrnnc-oss/docker-seafile-client/-/releases/tag [Unreleased]: https://gitlab.com/flrnnc-oss/docker-seafile-client/-/releases/Unreleased
<!-- /tag --/> <!-- /Unreleased /-->
<!-- 3.4.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.4.0 -->
<!-- 3.3.0 --> <!-- 3.3.0 -->
## [3.3.0] ## [3..0]
### Modified ### Modified
* Add TARGET environment variable to Makefile commands. * Add TARGET environment variable to Makefile commands.
### Fixed ### Fixed

View File

@@ -27,11 +27,11 @@ usermod -u $UID -g $GID seafile &> /dev/null
if [ "$IMAGE" == "flowgunso" ]; then if [ "$IMAGE" == "flowgunso" ]; then
echo echo
echo -e "┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓" 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 "┃ See the information notices at: ┃"
echo -e "┃ \thttps://forum.seafile.com/t/docker-client-to-sync-files-with-containers/8573 ┃" 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://gitlab.com/flrnnc-oss/docker-seafile-client ┃"
echo -e "┃ \thttps://hub.docker.com/r/flowgunso/seafile-client ┃" echo -e "┃ \thttps://hub.docker.com/r/flowgunso/seafile-client ┃"
echo -e "┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛" echo -e "┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛"
echo echo
fi fi

View File

@@ -110,7 +110,7 @@ class Client:
if variable.startswith("SEAF_LIBRARY"): if variable.startswith("SEAF_LIBRARY"):
# Get the variable name. # Get the variable name.
name = variable.split("_")[2] name = variable.split("_")[2].lower()
# Read the password as a secret. # Read the password as a secret.
if "_PASSWORD" in variable: if "_PASSWORD" in variable:

View File

@@ -1,3 +1,5 @@
name: mock-docker-seafile-client
services: services:
mariadb: mariadb:
image: mariadb:10.11 image: mariadb:10.11
@@ -31,7 +33,7 @@ services:
- memcached - memcached
client: client:
image: seafile-client:oldstable-flowgunso image: seafile-client:${TARGET}-flowgunso
volumes: volumes:
#- library:/library #- library:/library
- data:/seafile - data:/seafile