From bfa18fb745c95795c4bbaeeca801435d4146d79c Mon Sep 17 00:00:00 2001
From: Marco Wettstein <maw@panter.ch>
Date: Mon, 27 Sep 2021 23:48:18 +0200
Subject: [PATCH 1/2] feat: multiple fixes and feats

- allow to override node version for meteor
- fix current google cloud docker problem
- remvoe unneeded yarn install
---
 .../docker-build/scripts/ensureMeteorDockerfile       | 11 +++++++----
 dockerfiles/pipeline/Dockerfile                       |  6 +-----
 includes/docker-build.yml                             |  7 ++++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dockerfiles/docker-build/scripts/ensureMeteorDockerfile b/dockerfiles/docker-build/scripts/ensureMeteorDockerfile
index 13b51cd..3b70c0c 100644
--- a/dockerfiles/docker-build/scripts/ensureMeteorDockerfile
+++ b/dockerfiles/docker-build/scripts/ensureMeteorDockerfile
@@ -10,10 +10,13 @@ fi
 
 if [ ! -f Dockerfile ]; then
     echo "Creating Dockerfile"
-
-    NODE_VERSION_FULL=$(cat bundle/.node_version.txt)
-    NODE_VERSION=${NODE_VERSION_FULL/v/} # remove v
-    INSTALL_SCRIPTS = ""
+    if [[ ! -z "$METEOR_OVERRIDE_NODE_VERSION" ]]; then
+        NODE_VERSION=$METEOR_OVERRIDE_NODE_VERSION
+    else
+        NODE_VERSION_FULL=$(cat bundle/.node_version.txt)
+        NODE_VERSION=${NODE_VERSION_FULL/v/} # remove v
+    fi
+    INSTALL_SCRIPTS=""
     if [ -f package.json ] && [ -f yarn.lock ]; then
         read -d '' INSTALL_SCRIPTS <<EOF
 
diff --git a/dockerfiles/pipeline/Dockerfile b/dockerfiles/pipeline/Dockerfile
index fa98d3b..95d47e6 100644
--- a/dockerfiles/pipeline/Dockerfile
+++ b/dockerfiles/pipeline/Dockerfile
@@ -7,11 +7,7 @@ RUN rm /bin/sh && \
 
 RUN apt-get update
 RUN apt-get install -y apt-transport-https ca-certificates
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-
-RUN apt-get update
-RUN apt-get install -y git ssh-client openssl curl bash ca-certificates git gettext-base yarn
+RUN apt-get install -y git ssh-client openssl curl bash ca-certificates git gettext-base
 
 # #  very handy for easier signal handling of SIGINT/SIGTERM/SIGKILL etc.
 # RUN wget https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb
diff --git a/includes/docker-build.yml b/includes/docker-build.yml
index 15a44ac..f2f5131 100644
--- a/includes/docker-build.yml
+++ b/includes/docker-build.yml
@@ -21,7 +21,8 @@ variables:
   image: git.panter.ch:5001/catladder/gitlab-ci/docker-build:$PIPELINE_IMAGE_TAG
   services:
     - name: docker:20-dind
-      command: ["--tls=false"] # see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
+      # see https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27300#note_466755332
+      command: ["--tls=false"]
   variables:
     DOCKER_DRIVER: overlay2
     IMAGE_NAME: $CI_REGISTRY_IMAGE
@@ -31,7 +32,7 @@ variables:
   script:
     - time docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY
     - time docker pull $IMAGE_NAME:$CACHE_IMAGE_TAG || true
-    - time docker build --cache-from $IMAGE_NAME:$CACHE_IMAGE_TAG --tag $IMAGE_NAME:$IMAGE_TAG $DOCKER_DIR
+    - time docker build --network host --cache-from $IMAGE_NAME:$CACHE_IMAGE_TAG --tag $IMAGE_NAME:$IMAGE_TAG $DOCKER_DIR
     - time docker push $IMAGE_NAME:$IMAGE_TAG
     - time docker tag $IMAGE_NAME:$IMAGE_TAG $IMAGE_NAME:$CACHE_IMAGE_TAG
     - time docker push $IMAGE_NAME:$CACHE_IMAGE_TAG
@@ -43,7 +44,7 @@ variables:
     - ensureStorybookDockerfile
     - time docker login --username gitlab-ci-token --password $CI_JOB_TOKEN $CI_REGISTRY
     - time docker pull $CI_REGISTRY_IMAGE:$CACHE_IMAGE_TAG-storybook || true
-    - time docker build --cache-from $CI_REGISTRY_IMAGE:$CACHE_IMAGE_TAG-storybook --tag $CI_REGISTRY_IMAGE:$IMAGE_TAG-storybook $DOCKER_DIR -f Dockerfile-storybook
+    - time docker build --network host --cache-from $CI_REGISTRY_IMAGE:$CACHE_IMAGE_TAG-storybook --tag $CI_REGISTRY_IMAGE:$IMAGE_TAG-storybook $DOCKER_DIR -f Dockerfile-storybook
     - time docker push $CI_REGISTRY_IMAGE:$IMAGE_TAG-storybook
     - time docker tag $CI_REGISTRY_IMAGE:$IMAGE_TAG-storybook $CI_REGISTRY_IMAGE:$CACHE_IMAGE_TAG-storybook
     - time docker push $CI_REGISTRY_IMAGE:$CACHE_IMAGE_TAG-storybook
-- 
GitLab


From 41f2c0237cc972b48bbaa79e00282cd23a5e410c Mon Sep 17 00:00:00 2001
From: Gitlab Runner <pipeline@panter.ch>
Date: Tue, 28 Sep 2021 11:35:23 +0000
Subject: [PATCH 2/2] adjust PIPELINE_IMAGE_TAG

---
 helm-chart.yml             | 2 +-
 monorepo.yml               | 2 +-
 panter-kubernetes-base.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/helm-chart.yml b/helm-chart.yml
index 80fdaec..2ebfae2 100644
--- a/helm-chart.yml
+++ b/helm-chart.yml
@@ -11,7 +11,7 @@ image:
 variables:
   HELM_EXPERIMENTAL_OCI: 1
   AUTO_RELEASE: "true"
-  PIPELINE_IMAGE_TAG: 7141f3ed7c48985d0011c464ab27b462f8ada606
+  PIPELINE_IMAGE_TAG: bfa18fb745c95795c4bbaeeca801435d4146d79c
 
 stages:
   - lint
diff --git a/monorepo.yml b/monorepo.yml
index fb70027..6335bcb 100644
--- a/monorepo.yml
+++ b/monorepo.yml
@@ -12,7 +12,7 @@ include:
   - /includes/open-mr.yml
 
 variables:
-  PIPELINE_IMAGE_TAG: 7141f3ed7c48985d0011c464ab27b462f8ada606
+  PIPELINE_IMAGE_TAG: bfa18fb745c95795c4bbaeeca801435d4146d79c
 
 image: git.panter.ch:5001/catladder/gitlab-ci/pipeline:$PIPELINE_IMAGE_TAG
 
diff --git a/panter-kubernetes-base.yml b/panter-kubernetes-base.yml
index 3ec7ba4..9625e04 100644
--- a/panter-kubernetes-base.yml
+++ b/panter-kubernetes-base.yml
@@ -12,7 +12,7 @@ include:
   - /includes/open-mr.yml
 
 variables:
-  PIPELINE_IMAGE_TAG: 7141f3ed7c48985d0011c464ab27b462f8ada606
+  PIPELINE_IMAGE_TAG: bfa18fb745c95795c4bbaeeca801435d4146d79c
   CUSTOMER_NAME: panter
   APP_NAME: demo
   COMPONENT_NAME: web
-- 
GitLab