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
Format librairies name fetched from envvars to lower case.
2024-09-24 11:32:25 +00:00 · 2024-09-24 11:32:24 +00:00 · 2024-09-19 22:40:30 +00:00 · 2024-09-19 21:51:17 +00:00 · 2024-09-19 21:51:17 +00:00 · 2024-09-18 14:25:48 +00:00
7 changed files with 58 additions and 27 deletions
--- 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
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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 -->
-<!-- tag --/>
-## [tag]
+<!-- Unreleased --/>
+## [Unreleased] - year-month-date
 ### Added
 ### Changed
 ### Deprecated
@@ -16,8 +16,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Security

-[tag]: https://gitlab.com/flrnnc-oss/docker-seafile-client/-/releases/tag
-<!-- /tag --/>
+[Unreleased]: https://gitlab.com/flrnnc-oss/docker-seafile-client/-/releases/Unreleased
+<!-- /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..0]
+### Modified
+* Add TARGET environment variable to Makefile commands.
+### Fixed
+* Fix the TypeError for the skip SSL certificates parameters.
+
+[3.3.0]: https://gitlab.com/flrnnc-oss/docker-seafile-client/-/releases/3.3.0
+<!-- /3.3.0 -->

 <!-- 3.2.5 -->
 ## [3.2.5]
--- a/18
+++ b/18
@@ -1,24 +1,24 @@
-TARGET?=unstable
+TARGET?=stable

 # Mocking
 mock:
-	docker compose -f tests/mock/compose.yaml up -d
+	TARGET=${TARGET} docker compose -f tests/mock/compose.yaml up -d

 unmock:
-	docker compose -f tests/mock/compose.yaml down
+	TARGET=${TARGET} docker compose -f tests/mock/compose.yaml down

 client:
-	docker compose -f tests/mock/compose.yaml rm -fs client
-	docker compose -f tests/mock/compose.yaml up -d client
+	TARGET=${TARGET} docker compose -f tests/mock/compose.yaml rm -fs client
+	TARGET=${TARGET} docker compose -f tests/mock/compose.yaml up -d client

 shell:
-	docker compose -f tests/mock/compose.yaml exec client bash
+	TARGET=${TARGET} docker compose -f tests/mock/compose.yaml exec client bash

 logs:
-	docker compose -f tests/mock/compose.yaml logs -f client
+	TARGET=${TARGET} docker compose -f tests/mock/compose.yaml logs -f client

 ps:
-	docker compose -f tests/mock/compose.yaml ps
+	TARGET=${TARGET} docker compose -f tests/mock/compose.yaml ps

 # Build
 build:
@@ -32,6 +32,7 @@ test:

 # CI/CD
 documents:
+	python scripts/update-build-badge.py
 	python scripts/make-documents.py docker.md.j2
 	python scripts/make-documents.py docker-old.md.j2
 	python scripts/make-documents.py seafile.md.j2
@@ -46,7 +47,6 @@ publish-images:

 publish-documents:
 	bash scripts/publish-documents.sh
-	python scripts/update-build-badge.py

 save:
 	mkdir -p tarballs/
--- a/scripts/publish-documents.sh
+++ b/scripts/publish-documents.sh
@@ -8,11 +8,11 @@ token=$(curl -s \
 # Generate a JSON with the README.md as the full_description.
 json=$(jq -n \
    --arg readme "$(<documentations/docker.md)" \
-    '{"full_description": "'"$readme"'","description": "'"$DOCKER_REGISTRY_DESCRIPTION_FLRNNC"'"}')
+    '{"full_description": $readme,"description": "'"$DOCKER_REGISTRY_DESCRIPTION_FLRNNC"'"}')

 jsonOld=$(jq -n \
    --arg readme "$(<documentations/docker-old.md)" \
-    '{"full_description": "'"$readme"'","description": "'"$DOCKER_REGISTRY_DESCRIPTION_FLOWGUNSO"'"}')
+    '{"full_description": $readme,"description": "'"$DOCKER_REGISTRY_DESCRIPTION_FLOWGUNSO"'"}')

 # Update the Docker Hub repository's full_description.
 curl -siL \
--- 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
--- 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:
@@ -150,7 +150,7 @@ class Client:
    def configure(self):
        command = self.binary + ["config"] 
        if self.skip_ssl_cert:
-            subprocess.run(command +["-k", "disable_verify_certificate", "-v", self.skip_ssl_cert])
+            subprocess.run(command +["-k", "disable_verify_certificate", "-v", str(self.skip_ssl_cert)])
        if self.download_limit:
            subprocess.run(command +["-k", "download_limit", "-v", self.download_limit])
        if self.upload_limit:
--- 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
Author	SHA1	Message	Date
Florian Anceau	3670ad2fb8	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	2024-09-24 11:32:25 +00:00
Florian Anceau	062f57f002	Format librairies name fetched from envvars to lower case.	2024-09-24 11:32:24 +00:00
Florian Anceau	0b49050521	Fix build badge script ordering	2024-09-19 22:40:30 +00:00
Florian Anceau	62c80d3cac	Merge branch 'fix--skip-ssl-cert' into 'master' Fix skip SSL certificate parameter Close #72 See merge request flrnnc-oss/docker-seafile-client!21	2024-09-19 21:51:17 +00:00
Florian Anceau	a86c629d64	Fix skip SSL certificate parameter	2024-09-19 21:51:17 +00:00
Florian Anceau	085e2db3d9	Fix usage of full_description.	2024-09-18 14:25:48 +00:00