diff --git a/CHANGELOG.md b/CHANGELOG.md index b1bb7ff3ca7e95e69917b857a9b8483ac748a694..e122214a915dc05822b1e3d252b6ab7b1756fcb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [1.0.2](https://gitlab.com/to-be-continuous/docker-compose/compare/1.0.1...1.0.2) (2024-05-05) + + +### Bug Fixes + +* **workflow:** disable MR pipeline from prod & integ branches ([bedff8b](https://gitlab.com/to-be-continuous/docker-compose/commit/bedff8bbf87b5e77e66cbd34fdc08103f2cac8e5)) + ## [1.0.1](https://gitlab.com/to-be-continuous/docker-compose/compare/1.0.0...1.0.1) (2024-04-27) diff --git a/README.md b/README.md index efeb28a468ee6ef43530dce858a09374d29da370..d1585eca4ad7d92ae4002c643542221479f0ea85 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: gitlab.com/to-be-continuous/docker-compose/gitlab-ci-docker-compose@1.0.1 + - component: gitlab.com/to-be-continuous/docker-compose/gitlab-ci-docker-compose@1.0.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.0.1' + ref: '1.0.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 16a647d77c5a40aa50aece59870ffe04c76b8ec9..5faf4bcf27b045b0a9083bb0d652f299b82ab3cb 100644 --- a/templates/gitlab-ci-docker-compose.yml +++ b/templates/gitlab-ci-docker-compose.yml @@ -749,7 +749,7 @@ stages: image: $DCMP_IMAGE services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "docker-compose", "1.0.1"] + command: ["--service", "docker-compose", "1.0.2"] before_script: - !reference [.compose-scripts] - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"