diff --git a/CHANGELOG.md b/CHANGELOG.md index bae4829588e4f6831c952947dadb86f8438fb9e8..70574cd8ca6d8ba0d862bec14dfd8235023ed068 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.2.2](https://gitlab.com/to-be-continuous/docker-compose/compare/1.2.1...1.2.2) (2025-04-11) + + +### Bug Fixes + +* **envsubst:** leave lines with '# nosubst' unchanged when substituting (used to be simply dropped) ([392e60d](https://gitlab.com/to-be-continuous/docker-compose/commit/392e60d69d47130f7f1a249ef8001c1fe6b234d0)) + ## [1.2.1](https://gitlab.com/to-be-continuous/docker-compose/compare/1.2.0...1.2.1) (2025-02-01) diff --git a/README.md b/README.md index f5cabde3a1c1235044df8088b78fb803ddcbe3aa..e893d4e1df907c9bbc06c394fe1245e03e575b05 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Add the following to your `.gitlab-ci.yml`: ```yaml include: # 1: include the component - - component: $CI_SERVER_FQDN/to-be-continuous/docker-compose/gitlab-ci-docker-compose@1.2.1 + - component: $CI_SERVER_FQDN/to-be-continuous/docker-compose/gitlab-ci-docker-compose@1.2.2 # 2: set/override component inputs inputs: # ⚠ this is only an example @@ -32,7 +32,7 @@ Add the following to your `.gitlab-ci.yml`: include: # 1: include the template - project: 'to-be-continuous/docker-compose' - ref: '1.2.1' + ref: '1.2.2' file: '/templates/gitlab-ci-docker-compose.yml' variables: diff --git a/templates/gitlab-ci-docker-compose.yml b/templates/gitlab-ci-docker-compose.yml index 90522639b10b9e584de0a5d5d57df20b30062278..cf61088bc946d8927593b8dcae653408667e20c3 100644 --- a/templates/gitlab-ci-docker-compose.yml +++ b/templates/gitlab-ci-docker-compose.yml @@ -850,7 +850,7 @@ stages: image: $DCMP_IMAGE services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker-compose", "1.2.1"] + command: ["--service", "docker-compose", "1.2.2"] before_script: - !reference [.compose-scripts] - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"