Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: docker build checks are fixed #210

Merged
merged 1 commit into from
Aug 27, 2024
Merged

fix: docker build checks are fixed #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# Define the google cloud sdk image tag to use.
ARG GOOGLE_CLOUD_CLI_IMAGE_TAG
ARG GOOGLE_CLOUD_CLI_IMAGE_TAG=489.0.0-alpine

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

# https://github.com/docker/compose/releases
ENV COMPOSE_VERSION v2.23.1
ENV COMPOSE_VERSION=v2.23.1
# https://download.docker.com/linux/static/stable/x86_64
ENV DOCKER_VERSION 27.1.1
ENV DOCKER_BUILDX_VERSION 0.16.2
ENV HELM3_VERSION 3.14.3
ENV AWS_CLI_VERSION 1.32.14
ENV YQ4_VERSION v4.14.2
ENV FLUX2_RELEASE_VERSION 0.26.2
ENV STERN_RELEASE_VERSION 1.28.0
ENV DOCKER_VERSION=27.1.1
ENV DOCKER_BUILDX_VERSION=0.16.2
ENV HELM3_VERSION=3.14.3
ENV AWS_CLI_VERSION=1.32.14
ENV YQ4_VERSION=v4.14.2
ENV FLUX2_RELEASE_VERSION=0.26.2
ENV STERN_RELEASE_VERSION=1.28.0

# Use the gke-auth-plugin to authenticate to the GKE cluster.
ENV USE_GKE_GCLOUD_AUTH_PLUGIN true
ENV USE_GKE_GCLOUD_AUTH_PLUGIN=true

Check warning on line 18 in Dockerfile

View workflow job for this annotation

GitHub Actions / test

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "USE_GKE_GCLOUD_AUTH_PLUGIN")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

RUN apk add --no-cache py-pip python3-dev curl make gettext bash openssl libffi-dev openssl-dev gcc libc-dev jq yq rust cargo bat rsync yamllint util-linux && \
# Install docker and docker-compose.
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# make cli
#
DOCKER_VERSION=20.10.5
GOOGLE_CLOUD_CLI_IMAGE_TAG ?= 474.0.0-alpine
GOOGLE_CLOUD_CLI_IMAGE_TAG ?= 489.0.0-alpine

cli: build-docker-image
# Run the cli.
Expand All @@ -14,13 +14,13 @@ cli: build-docker-image
-it sparkfabrik/spark-k8s-deployer:latest bash -il

build-docker-image:
docker build \
docker --debug buildx build \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this ok ?

-t sparkfabrik/spark-k8s-deployer:latest \
--build-arg GOOGLE_CLOUD_CLI_IMAGE_TAG=$(GOOGLE_CLOUD_CLI_IMAGE_TAG) \
-f Dockerfile .

build-docker-image-build-args:
docker build \
docker --debug buildx build \
-t sparkfabrik/spark-k8s-deployer:latest \
--build-arg GOOGLE_CLOUD_CLI_IMAGE_TAG=$(GOOGLE_CLOUD_CLI_IMAGE_TAG) \
--build-arg QEMU_ARCHS="aarch64 arm x86_64" \
Expand Down