From a5d06ec558733f298bdd4e9f7466e9bbb9a917a3 Mon Sep 17 00:00:00 2001
From: Frank van Lankvelt <fvanlankvelt@stackstate.com>
Date: Mon, 5 Feb 2024 14:42:41 +0100
Subject: [PATCH 1/2] STAC-0: add gitlab build config

---
 .gitlab-ci.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000..d746d44383
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,35 @@
+variables:
+  DST_REPOSITORY: quay.io/stackstate/opentelemetry-demo
+  OPENTELEMETRY_DEMO_VERSION: dev
+  DOCKER_DRIVER: overlay2
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_TLS_CERTDIR: ""
+
+services:
+  - alias: docker
+    command:
+      - --experimental
+      - --tls=false
+    name: ${DOCKER_PROXY_URL}/docker:20-dind
+
+stages:
+  - build
+
+build-featureflag:
+  tags:
+    - sts-k8s-xl-no-agent-runner
+  stage: build
+  image: ${DOCKER_PROXY_URL}/docker:20-git
+  script:
+    - echo "${quay_password}" | docker login --username=${quay_user} --password-stdin quay.io
+    - echo "${artifactory_password}" | docker login --username=${artifactory_user} --password-stdin artifactory.tooling.stackstate.io
+    - DST_TAG="${OPENTELEMETRY_DEMO_VERSION}-${CI_COMMIT_SHORT_SHA}-featureflagservice"
+    # fix for https://github.com/docker/buildx/issues/493
+    - docker run --privileged --rm artifactory.tooling.stackstate.io/docker-virtual/tonistiigi/binfmt --install all
+    - docker buildx create --name builder --use --bootstrap
+    - docker buildx build --label "published-by=${CI_JOB_URL}" --platform linux/amd64,linux/arm64 --file "$CI_PROJECT_DIR/src/featureflagservice/Dockerfile" --tag "${DST_REPOSITORY}:${DST_TAG}" --push "$CI_PROJECT_DIR"
+  retry:
+    max: 2
+    when:
+      - always
+

From fb8c6ff2b213c9dea51779bc069bdd4d780397ad Mon Sep 17 00:00:00 2001
From: Frank van Lankvelt <fvanlankvelt@stackstate.com>
Date: Wed, 7 Feb 2024 13:33:21 +0100
Subject: [PATCH 2/2] STAC-0: rebuild wolverminion images

---
 .gitlab-ci.yml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d746d44383..9b13f58eef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ services:
 stages:
   - build
 
-build-featureflag:
+.build-service:
   tags:
     - sts-k8s-xl-no-agent-runner
   stage: build
@@ -23,13 +23,27 @@ build-featureflag:
   script:
     - echo "${quay_password}" | docker login --username=${quay_user} --password-stdin quay.io
     - echo "${artifactory_password}" | docker login --username=${artifactory_user} --password-stdin artifactory.tooling.stackstate.io
-    - DST_TAG="${OPENTELEMETRY_DEMO_VERSION}-${CI_COMMIT_SHORT_SHA}-featureflagservice"
+    - DST_TAG="${OPENTELEMETRY_DEMO_VERSION}-${CI_COMMIT_SHORT_SHA}-${SERVICE}"
     # fix for https://github.com/docker/buildx/issues/493
     - docker run --privileged --rm artifactory.tooling.stackstate.io/docker-virtual/tonistiigi/binfmt --install all
     - docker buildx create --name builder --use --bootstrap
-    - docker buildx build --label "published-by=${CI_JOB_URL}" --platform linux/amd64,linux/arm64 --file "$CI_PROJECT_DIR/src/featureflagservice/Dockerfile" --tag "${DST_REPOSITORY}:${DST_TAG}" --push "$CI_PROJECT_DIR"
+    - docker buildx build --label "published-by=${CI_JOB_URL}" --platform linux/amd64,linux/arm64 --file "$CI_PROJECT_DIR/src/${SERVICE}/Dockerfile" --tag "${DST_REPOSITORY}:${DST_TAG}" --push "$CI_PROJECT_DIR"
   retry:
     max: 2
     when:
       - always
 
+build-featureflag:
+  extends: .build-service
+  variables:
+    SERVICE: featureflagservice
+
+build-adservice:
+  extends: .build-service
+  variables:
+    SERVICE: adservice
+
+build-frauddetection:
+  extends: .build-service
+  variables:
+    SERVICE: frauddetectionservice