Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sparkfabrik/spark-k8s-deployer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 98ccaffe0a5be2c405f181977d812d646a39c873
Choose a base ref
..
head repository: sparkfabrik/spark-k8s-deployer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ac6623e74be82280777975390285172a8eca4cd7
Choose a head ref
Showing with 7 additions and 1 deletion.
  1. +2 −0 .github/workflows/docker-publish.yml
  2. +2 −1 Dockerfile
  3. +3 −0 Makefile
2 changes: 2 additions & 0 deletions .github/workflows/docker-publish.yml
View file
Original file line number Diff line number Diff line change
@@ -86,6 +86,8 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
context: .
build-args: |
GOOGLE_CLOUD_CLI_IMAGE_TAG=${{ steps.vars.outputs.google_cloud_cli_image_tag }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

3 changes: 2 additions & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARG GOOGLE_CLOUD_CLI_IMAGE_TAG=458.0.1-alpine
# Define the google cloud sdk image tag to use.
ARG GOOGLE_CLOUD_CLI_IMAGE_TAG

FROM eu.gcr.io/google.com/cloudsdktool/google-cloud-cli:${GOOGLE_CLOUD_CLI_IMAGE_TAG}

3 changes: 3 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -28,3 +28,6 @@ build-docker-image-build-args:

tests:
cd test && DOCKER_VERSION=$(DOCKER_VERSION) docker-compose run --rm docker-client ash -c "sleep 3; docker run --rm hello-world"

print-google-cloud-cli-image-tag:
@echo $(GOOGLE_CLOUD_CLI_IMAGE_TAG)