Skip to content

Commit

Permalink
Merge pull request #3494 from grafana/stop_building_loadimpact_k6
Browse files Browse the repository at this point in the history
Remove `loadimpact/k6` Docker image from build process
  • Loading branch information
andrewslotin authored Dec 7, 2023
2 parents ab237fa + 7f578c9 commit f67be4c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 37 deletions.
17 changes: 0 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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: |
Expand All @@ -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"
Expand All @@ -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:
Expand Down
7 changes: 0 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 0 additions & 13 deletions entrypoint-legacy.sh

This file was deleted.

0 comments on commit f67be4c

Please sign in to comment.