Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit d715a10

Browse files
Simplify Dockerfile, removing unused env and args
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
1 parent 1e69e70 commit d715a10

2 files changed

Lines changed: 1 addition & 11 deletions

File tree

Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ FROM docker:${CLI_VERSION} AS cli
117117
# DOWNLOAD
118118
####
119119
FROM golang:${GO_VERSION} AS download
120-
ARG SNYK_DESKTOP_VERSION=1.332.0
121-
ARG SNYK_USER_VERSION=1.334.0
122120
COPY builder.Makefile vars.mk ./
123121
RUN make -f builder.Makefile download
124122

@@ -128,14 +126,8 @@ RUN make -f builder.Makefile download
128126
FROM builder AS e2e
129127
ARG TARGETOS
130128
ARG TARGETARCH
131-
ARG SNYK_DESKTOP_VERSION=1.332.0
132-
ENV SNYK_DESKTOP_VERSION=${SNYK_DESKTOP_VERSION}
133-
ARG SNYK_USER_VERSION=1.334.0
134-
ENV SNYK_USER_VERSION=${SNYK_USER_VERSION}
135129
ARG TAG_NAME
136130
ENV TAG_NAME=$TAG_NAME
137-
ENV SNYK_USER_PATH="/root/e2e"
138-
ENV SNYK_DESKTOP_PATH="/root/.docker/scan"
139131
ENV DOCKER_CONFIG="/root/.docker"
140132

141133
# install snyk binaries

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
include vars.mk
1515
export DOCKER_BUILDKIT=1
1616

17-
BUILD_ARGS := --build-arg SNYK_DESKTOP_VERSION=$(SNYK_DESKTOP_VERSION)\
18-
--build-arg SNYK_USER_VERSION=$(SNYK_USER_VERSION)\
19-
--build-arg GO_VERSION=$(GO_VERSION)\
17+
BUILD_ARGS := --build-arg GO_VERSION=$(GO_VERSION)\
2018
--build-arg CLI_VERSION=$(CLI_VERSION)\
2119
--build-arg ALPINE_VERSION=$(ALPINE_VERSION)\
2220
--build-arg GOLANGCI_LINT_VERSION=$(GOLANGCI_LINT_VERSION) \

0 commit comments

Comments
 (0)