From 4c90fde2a0808d5790841db8fbf87cf84b1fa9ab Mon Sep 17 00:00:00 2001
From: Andrew Slotin <andrew.slotin@grafana.com>
Date: Wed, 6 Dec 2023 17:07:46 +0100
Subject: [PATCH 1/2] Remove `loadimpact/k6` Docker image from build process

---
 .github/workflows/build.yml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 27c5d123c29..cfe398bca03 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,8 +22,6 @@ defaults:
 
 env:
   APP_NAME: "k6"
-  # We'll push to two DockerHub repos at once; `loadimpact/k6` repo is required for backwards compatibility
-  LI_DOCKER_IMAGE_ID: "loadimpact/k6"
   DOCKER_IMAGE_ID: "grafana/k6"
   GHCR_IMAGE_ID: ${{ github.repository }}
   DEFAULT_GO_VERSION: "1.21.5"
@@ -185,11 +183,6 @@ jobs:
             --platform linux/amd64,linux/arm64 \
             -t $DOCKER_IMAGE_ID:master-with-browser \
             -t ghcr.io/$GHCR_IMAGE_ID:master-with-browser .
-          # LoadImpact images are deprecated, we don't build arm64 for it.
-          docker buildx build --push \
-            --target legacy \
-            --platform linux/amd64 \
-            -t $LI_DOCKER_IMAGE_ID:master .
       - name: Publish tagged version images
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         run: |
@@ -205,11 +198,6 @@ jobs:
             --platform linux/amd64,linux/arm64 \
             -t $DOCKER_IMAGE_ID:$VERSION-with-browser \
             -t ghcr.io/$GHCR_IMAGE_ID:$VERSION-with-browser .
-          # LoadImpact images are deprecated, we don't build arm64 for it.
-          docker buildx build --push \
-            --target legacy \
-            --platform linux/amd64 \
-            -t $LI_DOCKER_IMAGE_ID:$VERSION .
           # We also want to tag the latest stable version as latest
           if [[ ! "$VERSION" =~ (RC|rc) ]]; then
             echo "Publish $GHCR_IMAGE_ID:latest"
@@ -223,11 +211,6 @@ jobs:
               --platform linux/amd64,linux/arm64 \
               -t $DOCKER_IMAGE_ID:latest-with-browser \
               -t ghcr.io/$GHCR_IMAGE_ID:latest-with-browser .
-            # LoadImpact images are deprecated, we don't build arm64 for it.
-            docker buildx build --push \
-              --target legacy \
-              --platform linux/amd64 \
-              -t $LI_DOCKER_IMAGE_ID:latest .
           fi
 
   package-windows:

From 7f578c9f4c78533eadb69eafc72d8b57e4651aaf Mon Sep 17 00:00:00 2001
From: Andrew Slotin <andrew.slotin@grafana.com>
Date: Wed, 6 Dec 2023 17:36:05 +0100
Subject: [PATCH 2/2] Remove legacy image stage from the Dockerfile

---
 Dockerfile           |  7 -------
 entrypoint-legacy.sh | 13 -------------
 2 files changed, 20 deletions(-)
 delete mode 100755 entrypoint-legacy.sh

diff --git a/Dockerfile b/Dockerfile
index 0869645eadb..24a31ca0b7a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,13 +18,6 @@ WORKDIR /home/k6
 
 ENTRYPOINT ["k6"]
 
-# Legacy loadimpact/k6 image
-FROM release as legacy
-
-COPY entrypoint-legacy.sh /usr/bin/
-
-ENTRYPOINT ["/usr/bin/entrypoint-legacy.sh"]
-
 # Browser-enabled bundle
 FROM release as with-browser
 
diff --git a/entrypoint-legacy.sh b/entrypoint-legacy.sh
deleted file mode 100755
index 560ed02736c..00000000000
--- a/entrypoint-legacy.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-cat >&2 <<-EOF
-+------------------------------------------------------------------------------+
-| WARNING: The loadimpact/k6 Docker image has been replaced by grafana/k6.     |
-|          THIS IMAGE IS DEPRECATED and its support will be discontinued after |
-|          Dec 31, 2023. Please update your scripts to use grafana/k6 to       |
-|          continue using the latest version of k6.                            |
-+------------------------------------------------------------------------------+
-
-EOF
-
-/usr/bin/k6 "$@"