From d17e12f3b54ab0edd295cc4a570846861b1c5a8a Mon Sep 17 00:00:00 2001
From: Jacob Martin <jakub.wit.martin@gmail.com>
Date: Fri, 9 Dec 2022 13:13:11 +0100
Subject: [PATCH] Revert "Publish ARM images (#11)"

This reverts commit d6808e6d2238ae8f5b28df696871e56982bea54f.
---
 .github/workflows/build.yml                   |  82 --------
 .github/workflows/deploy-preproduction.yml    | 182 ++++++------------
 .../workflows/deploy-production-latest.yml    |  12 +-
 .github/workflows/deploy-production.yml       |  12 +-
 base-alpine/Dockerfile                        |  15 +-
 base-debian/Dockerfile                        |  18 +-
 dotnet/Dockerfile                             |   9 +-
 golang/Dockerfile                             |  10 +-
 javascript/Dockerfile                         |   3 +-
 python/Dockerfile                             |   5 +-
 10 files changed, 94 insertions(+), 254 deletions(-)
 delete mode 100644 .github/workflows/build.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index 3e19a00..0000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-name: Build
-
-on:
-  push:
-    ignore-branches: [main, future]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-env:
-  # The Pulumi version doesn't matter much, it's just used for sanity testing
-  # but worth to update every once in a while
-  PULUMI_VERSION: "v3.46.0"
-  REPOSITORY_BASE_PATH: spaceliftbuild
-
-jobs:
-  build:
-    if: ${{ github.ref_type != 'tag' }}
-    name: 🚧 ${{ matrix.lang }} on ${{ matrix.arch }} 
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      max-parallel: 2 # ECR has pretty aggressive rate limiting 😪
-      matrix:
-        arch: [amd64, arm64]
-        lang: [javascript, python, golang, dotnet]
-    
-    env:
-      BASE_IMAGE_NAME: ${{ (matrix.lang == 'javascript' || matrix.lang == 'golang') && 'runner-pulumi-base-alpine' || 'runner-pulumi-base-debian' }}
-      MAIN_IMAGE_FULL_NAME: runner-pulumi-${{ matrix.lang }}-${{ matrix.arch }}:${{ github.sha }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@main
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        if: matrix.arch == 'arm64'
-        with:
-          platforms: linux/arm64
-
-      # Building doesn't work with buildx here because of
-      # a stupid behavior:
-      # https://github.com/moby/moby/issues/42893#issuecomment-1241274246
-      # So we use plain docker commands.
-      
-      - name: Build base image (Alpine or Debian)
-        env:
-          CONTEXT: ${{ (matrix.lang == 'javascript' || matrix.lang == 'golang') && 'base-alpine' || 'base-debian' }}
-        run: |
-          docker build \
-            --build-arg PULUMI_VERSION=${{ env.PULUMI_VERSION }} \
-            --build-arg TARGETARCH=${{ matrix.arch }} \
-            --platform linux/${{ matrix.arch }} \
-            -t ${{ env.REPOSITORY_BASE_PATH }}/${{ env.BASE_IMAGE_NAME }}:${{ github.sha }} \
-            $CONTEXT
-
-      - name: Build main image
-        run: |
-          docker build \
-            --build-arg REPOSITORY_BASE_PATH=${{ env.REPOSITORY_BASE_PATH }} \
-            --build-arg RELEASE_VERSION=${{ github.sha }} \
-            --platform linux/${{ matrix.arch }} \
-            -t ${{ env.MAIN_IMAGE_FULL_NAME }} \
-            ${{ matrix.lang }}
-      
-      - name: Pulumi binary sanity test
-        run: |
-          docker run --rm ${{ env.MAIN_IMAGE_FULL_NAME }} pulumi about
-      
-      - name: ${{ matrix.lang }} sanity test
-        run: |
-          if [ "${{ matrix.lang }}" == "javascript" ]; then
-            docker run --rm ${{ env.MAIN_IMAGE_FULL_NAME }} node --version
-          elif [ "${{ matrix.lang }}" == "python" ]; then
-            docker run --rm ${{ env.MAIN_IMAGE_FULL_NAME }} python --version
-          elif [ "${{ matrix.lang }}" == "golang" ]; then
-            docker run --rm ${{ env.MAIN_IMAGE_FULL_NAME }} go version
-          elif [ "${{ matrix.lang }}" == "dotnet" ]; then
-            docker run --rm ${{ env.MAIN_IMAGE_FULL_NAME }} dotnet --version
-          fi
diff --git a/.github/workflows/deploy-preproduction.yml b/.github/workflows/deploy-preproduction.yml
index 4035351..14bc8ea 100644
--- a/.github/workflows/deploy-preproduction.yml
+++ b/.github/workflows/deploy-preproduction.yml
@@ -18,19 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: linux/arm64
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - name: Set env
         run: echo "PULUMI_VERSION=${RELEASE_VERSION#dev-}" >> $GITHUB_ENV
 
@@ -50,33 +40,24 @@ jobs:
         env:
           REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
-      - name: Build and push the image
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          context: base-alpine
-          build-args: PULUMI_VERSION=${PULUMI_VERSION}
-          tags: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}/runner-pulumi-base-alpine:${RELEASE_VERSION}
+      - name: Build the image
+        run: cd base-alpine && docker build --build-arg PULUMI_VERSION=${PULUMI_VERSION} --tag ${REPOSITORY_BASE_PATH}/runner-pulumi-base-alpine:${RELEASE_VERSION} .
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
+
+      - name: Push the image to ECR
+        run: docker push ${REPOSITORY_BASE_PATH}/runner-pulumi-base-alpine:${RELEASE_VERSION}
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
   base-debian:
     name: Build and deploy the base Debian image
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: linux/arm64
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - name: Set env
         run: echo "PULUMI_VERSION=${RELEASE_VERSION#dev-}" >> $GITHUB_ENV
 
@@ -96,14 +77,15 @@ jobs:
         env:
           REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
-      - name: Build and push the image
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          context: base-debian
-          build-args: PULUMI_VERSION=${PULUMI_VERSION}
-          tags: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}/runner-pulumi-base-debian:${RELEASE_VERSION}
+      - name: Build the image
+        run: cd base-debian && docker build --build-arg PULUMI_VERSION=${PULUMI_VERSION} --tag ${REPOSITORY_BASE_PATH}/runner-pulumi-base-debian:${RELEASE_VERSION} .
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
+
+      - name: Push the image to ECR
+        run: docker push ${REPOSITORY_BASE_PATH}/runner-pulumi-base-debian:${RELEASE_VERSION}
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
   javascript:
     needs:
@@ -112,19 +94,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: linux/arm64
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - name: Set env
         run: echo "PULUMI_VERSION=${RELEASE_VERSION#dev-}" >> $GITHUB_ENV
 
@@ -144,16 +116,15 @@ jobs:
         env:
           REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
-      - name: Build and push the image
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          context: javascript
-          build-args: |
-            REPOSITORY_BASE_PATH=${REPOSITORY_BASE_PATH}
-            RELEASE_VERSION=${RELEASE_VERSION}
-          tags: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}/runner-pulumi-javascript:${RELEASE_VERSION}
+      - name: Build the image
+        run: cd javascript && docker build --build-arg REPOSITORY_BASE_PATH=${REPOSITORY_BASE_PATH} --build-arg RELEASE_VERSION=${RELEASE_VERSION} --tag ${REPOSITORY_BASE_PATH}/runner-pulumi-javascript:${RELEASE_VERSION} .
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
+
+      - name: Push the image to ECR
+        run: docker push ${REPOSITORY_BASE_PATH}/runner-pulumi-javascript:${RELEASE_VERSION}
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
   golang:
     needs:
@@ -162,19 +133,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: linux/arm64
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - name: Set env
         run: echo "PULUMI_VERSION=${RELEASE_VERSION#dev-}" >> $GITHUB_ENV
 
@@ -194,16 +155,15 @@ jobs:
         env:
           REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
-      - name: Build and push the image
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          context: golang
-          build-args: |
-            REPOSITORY_BASE_PATH=${REPOSITORY_BASE_PATH}
-            RELEASE_VERSION=${RELEASE_VERSION}
-          tags: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}/runner-pulumi-golang:${RELEASE_VERSION}
+      - name: Build the image
+        run: cd golang && docker build --build-arg REPOSITORY_BASE_PATH=${REPOSITORY_BASE_PATH} --build-arg RELEASE_VERSION=${RELEASE_VERSION} --tag ${REPOSITORY_BASE_PATH}/runner-pulumi-golang:${RELEASE_VERSION} .
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
+
+      - name: Push the image to ECR
+        run: docker push ${REPOSITORY_BASE_PATH}/runner-pulumi-golang:${RELEASE_VERSION}
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
   python:
     needs:
@@ -212,19 +172,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: linux/arm64
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - name: Set env
         run: echo "PULUMI_VERSION=${RELEASE_VERSION#dev-}" >> $GITHUB_ENV
 
@@ -244,16 +194,15 @@ jobs:
         env:
           REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
-      - name: Build and push the image
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          context: python
-          build-args: |
-            REPOSITORY_BASE_PATH=${REPOSITORY_BASE_PATH}
-            RELEASE_VERSION=${RELEASE_VERSION}
-          tags: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}/runner-pulumi-python:${RELEASE_VERSION}
+      - name: Build the image
+        run: cd python && docker build --build-arg REPOSITORY_BASE_PATH=${REPOSITORY_BASE_PATH} --build-arg RELEASE_VERSION=${RELEASE_VERSION} --tag ${REPOSITORY_BASE_PATH}/runner-pulumi-python:${RELEASE_VERSION} .
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
+
+      - name: Push the image to ECR
+        run: docker push ${REPOSITORY_BASE_PATH}/runner-pulumi-python:${RELEASE_VERSION}
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
   dotnet:
     needs:
@@ -262,19 +211,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: linux/arm64
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
       - name: Set env
         run: echo "PULUMI_VERSION=${RELEASE_VERSION#dev-}" >> $GITHUB_ENV
 
@@ -294,13 +233,12 @@ jobs:
         env:
           REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
 
-      - name: Build and push the image
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          platforms: linux/amd64,linux/arm64
-          context: dotnet
-          build-args: |
-            REPOSITORY_BASE_PATH=${REPOSITORY_BASE_PATH}
-            RELEASE_VERSION=${RELEASE_VERSION}
-          tags: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}/runner-pulumi-dotnet:${RELEASE_VERSION}
+      - name: Build the image
+        run: cd dotnet && docker build --build-arg REPOSITORY_BASE_PATH=${REPOSITORY_BASE_PATH} --build-arg RELEASE_VERSION=${RELEASE_VERSION} --tag ${REPOSITORY_BASE_PATH}/runner-pulumi-dotnet:${RELEASE_VERSION} .
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
+
+      - name: Push the image to ECR
+        run: docker push ${REPOSITORY_BASE_PATH}/runner-pulumi-dotnet:${RELEASE_VERSION}
+        env:
+          REPOSITORY_BASE_PATH: ${{ secrets.PREPROD_REPOSITORY_BASE_PATH }}
diff --git a/.github/workflows/deploy-production-latest.yml b/.github/workflows/deploy-production-latest.yml
index 5dcd3d2..9a7b313 100644
--- a/.github/workflows/deploy-production-latest.yml
+++ b/.github/workflows/deploy-production-latest.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
       - name: Set env
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
       - name: Set env
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
       - name: Set env
@@ -133,7 +133,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
       - name: Set env
@@ -172,7 +172,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
       - name: Set env
@@ -211,7 +211,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
       - name: Set env
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
index 1ea10df..bfd0785 100644
--- a/.github/workflows/deploy-production.yml
+++ b/.github/workflows/deploy-production.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Set env
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Set env
@@ -94,7 +94,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Set env
@@ -133,7 +133,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Set env
@@ -172,7 +172,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Set env
@@ -211,7 +211,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@main
+        uses: actions/checkout@master
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Set env
diff --git a/base-alpine/Dockerfile b/base-alpine/Dockerfile
index a0b05ce..b3ccea8 100644
--- a/base-alpine/Dockerfile
+++ b/base-alpine/Dockerfile
@@ -1,18 +1,9 @@
 FROM public.ecr.aws/spacelift/runner-terraform
 ARG PULUMI_VERSION
-ARG TARGETARCH
 
 USER root
 WORKDIR /home/spacelift
-
-RUN if [ "$TARGETARCH" = "amd64" ]; then \
-    wget -q "https://get.pulumi.com/releases/sdk/pulumi-${PULUMI_VERSION}-linux-x64.tar.gz" && \
-    tar -xf pulumi-${PULUMI_VERSION}-linux-x64.tar.gz; \
-  else \
-    wget -q "https://get.pulumi.com/releases/sdk/pulumi-${PULUMI_VERSION}-linux-arm64.tar.gz" && \
-    tar -xf pulumi-${PULUMI_VERSION}-linux-arm64.tar.gz; \
-  fi; \
-  mv pulumi/* /usr/local/bin/; \
-  rm -rf pulumi-${PULUMI_VERSION}*.tar.gz
-
+RUN wget "https://get.pulumi.com/releases/sdk/pulumi-${PULUMI_VERSION}-linux-x64.tar.gz"
+RUN tar -xf pulumi-${PULUMI_VERSION}-linux-x64.tar.gz
+RUN mv pulumi/* /usr/local/bin/
 USER spacelift
diff --git a/base-debian/Dockerfile b/base-debian/Dockerfile
index b6190be..722e95c 100644
--- a/base-debian/Dockerfile
+++ b/base-debian/Dockerfile
@@ -1,22 +1,14 @@
 FROM debian:latest
 ARG PULUMI_VERSION
-ARG TARGETARCH
 
 RUN echo "hosts: files dns" > /etc/nsswitch.conf \
   && adduser --disabled-password --uid=1983 spacelift
 
 USER root
 WORKDIR /home/spacelift
-RUN apt-get update && apt-get install -y wget procps
-
-RUN if [ "$TARGETARCH" = "amd64" ]; then \
-    wget -q "https://get.pulumi.com/releases/sdk/pulumi-${PULUMI_VERSION}-linux-x64.tar.gz" && \
-    tar -xf pulumi-${PULUMI_VERSION}-linux-x64.tar.gz; \
-  else \
-    wget -q "https://get.pulumi.com/releases/sdk/pulumi-${PULUMI_VERSION}-linux-arm64.tar.gz" && \
-    tar -xf pulumi-${PULUMI_VERSION}-linux-arm64.tar.gz; \
-  fi; \
-  mv pulumi/* /usr/local/bin/; \
-  rm -rf pulumi-${PULUMI_VERSION}*.tar.gz
-
+RUN apt-get update
+RUN apt-get install -y wget procps
+RUN wget "https://get.pulumi.com/releases/sdk/pulumi-${PULUMI_VERSION}-linux-x64.tar.gz"
+RUN tar -xf pulumi-${PULUMI_VERSION}-linux-x64.tar.gz
+RUN mv pulumi/* /usr/local/bin/
 USER spacelift
diff --git a/dotnet/Dockerfile b/dotnet/Dockerfile
index a9e4821..69412ba 100644
--- a/dotnet/Dockerfile
+++ b/dotnet/Dockerfile
@@ -1,15 +1,14 @@
-ARG REPOSITORY_BASE_PATH
 ARG RELEASE_VERSION
+ARG REPOSITORY_BASE_PATH
+
 FROM ${REPOSITORY_BASE_PATH}/runner-pulumi-base-debian:${RELEASE_VERSION}
 
 USER root
 RUN apt-get install -y icu-devtools
 USER spacelift
-
-RUN wget -q https://dot.net/v1/dotnet-install.sh
+RUN wget https://dot.net/v1/dotnet-install.sh
 RUN chmod 777 dotnet-install.sh
-RUN ./dotnet-install.sh -c STS
-
+RUN ./dotnet-install.sh -c Current
 SHELL ["/bin/sh", "-c"]
 ENV DOTNET_ROOT="/home/spacelift/.dotnet"
 ENV PATH="$PATH:/home/spacelift/.dotnet"
diff --git a/golang/Dockerfile b/golang/Dockerfile
index a692078..baf2bd7 100644
--- a/golang/Dockerfile
+++ b/golang/Dockerfile
@@ -1,11 +1,11 @@
-ARG REPOSITORY_BASE_PATH
 ARG RELEASE_VERSION
-FROM ${REPOSITORY_BASE_PATH}/runner-pulumi-base-alpine:${RELEASE_VERSION}
+ARG REPOSITORY_BASE_PATH
+
+FROM golang:1.19-alpine3.16 as golang-source
 
+FROM ${REPOSITORY_BASE_PATH}/runner-pulumi-base-alpine:${RELEASE_VERSION}
 USER root
 WORKDIR /home/spacelift
-
-COPY --from=golang:1.19-alpine /usr/local/go/ /usr/local/go/
+COPY --from=golang-source /usr/local/go /usr/local/go
 ENV PATH=${PATH}:/usr/local/go/bin
-
 USER spacelift
diff --git a/javascript/Dockerfile b/javascript/Dockerfile
index c408974..f3acea4 100644
--- a/javascript/Dockerfile
+++ b/javascript/Dockerfile
@@ -1,5 +1,6 @@
-ARG REPOSITORY_BASE_PATH
 ARG RELEASE_VERSION
+ARG REPOSITORY_BASE_PATH
+
 FROM ${REPOSITORY_BASE_PATH}/runner-pulumi-base-alpine:${RELEASE_VERSION}
 
 USER root
diff --git a/python/Dockerfile b/python/Dockerfile
index 251b278..e02070f 100644
--- a/python/Dockerfile
+++ b/python/Dockerfile
@@ -1,9 +1,10 @@
-ARG REPOSITORY_BASE_PATH
 ARG RELEASE_VERSION
+ARG REPOSITORY_BASE_PATH
+
 FROM ${REPOSITORY_BASE_PATH}/runner-pulumi-base-debian:${RELEASE_VERSION}
 
 USER root
 RUN apt-get install -y git python3 python3-pip python3-dev python3-venv && ln -sf python3 /usr/bin/python
 RUN pip3 install --no-cache --upgrade pip setuptools wheel
-ENV PATH="$PATH:./.pulumi/bin"
 USER spacelift
+ENV PATH="$PATH:./.pulumi/bin"