Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	CHANGELOG.md

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.1.0
+  - component: $CI_SERVER_FQDN/to-be-continuous/docker-compose/gitlab-ci-docker-compose@1.2.0
     # 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.1.0'
+    ref: '1.2.0'
     file: '/templates/gitlab-ci-docker-compose.yml'
 
 variables:

templates/gitlab-ci-docker-compose.yml

@@ -179,9 +179,6 @@ workflow:
     - when: on_success
 
 variables:
-  # variabilized tracking image
-  TBC_TRACKING_IMAGE: registry.gitlab.com/to-be-continuous/tools/tracking:master
-
   # Default Docker image (use a public image - can be overridden)
   DCMP_IMAGE: $[[ inputs.image ]]
   DCMP_CMD: $[[ inputs.cmd ]]
@@ -804,7 +801,7 @@ stages:
   image: $DCMP_IMAGE
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "docker-compose", "1.1.0"]
+      command: ["--service", "docker-compose", "1.2.0"]
   before_script:
     - !reference [.compose-scripts]
     - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"