diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 327488997079d175964ed4c01ddc5fb669cd61e8..266e8598710b562af804577a3fad1ccf45bf979a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,11 +165,8 @@ docker: strategy: depend variables: PARENT_PIPELINE_ID: $CI_PIPELINE_ID - only: - refs: - - develop - - main - - beta - - alpha - variables: - - $CI_PROJECT_NAMESPACE == "adaures" + rules: + - if: ($CI_COMMIT_BRANCH == "alpha" || $CI_COMMIT_BRANCH == "alpha" || $CI_COMMIT_BRANCH == "beta") && $CI_PROJECT_NAMESPACE == "adaures" + exists: + - CP_VERSION.env + - if: ($CI_COMMIT_BRANCH == "develop" && $CI_PROJECT_NAMESPACE == "adaures") diff --git a/docs/src/getting-started/docker.md b/docs/src/getting-started/docker.md index 04ff21341d6f35f8d28aa00d91e4ee8e9b796c89..e75dd1c9074ab72e4061ad22643d4bacd718144b 100644 --- a/docs/src/getting-started/docker.md +++ b/docs/src/getting-started/docker.md @@ -21,6 +21,8 @@ can be added as a cache handler. - `develop` [unstable], latest development branch build - `beta` [stable], latest beta version build - `1.0.0-beta.x` [stable], specific beta version build (since `1.0.0-beta.22`) +- `latest` [stable], latest version build +- `1.x.x` [stable], specific version build (since `1.0.0`) ## Example usage @@ -33,7 +35,7 @@ can be added as a cache handler. services: app: - image: castopod/app:beta + image: castopod/app:latest container_name: "castopod-app" volumes: - castopod-media:/opt/castopod/public/media @@ -51,7 +53,7 @@ can be added as a cache handler. restart: unless-stopped web-server: - image: castopod/web-server:beta + image: castopod/web-server:latest container_name: "castopod-web-server" volumes: - castopod-media:/var/www/html/media