put everything in the dockerfile back

pipekit · Jul 11, 2023 · bc5e465 · bc5e465
1 parent 52d2c77
commit bc5e465
Showing 1 changed file with 18 additions and 24 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,9 @@
 #syntax=docker/dockerfile:1.2
+ARG GIT_COMMIT=unknown
+ARG GIT_TAG=unknown
+ARG GIT_TREE_STATE=unknown
 
-FROM golang:1.19-alpine3.16 as builder
+FROM golang:1.20-alpine3.16 as builder
 
 RUN apk update && apk add --no-cache \
     git \
@@ -21,7 +24,7 @@ COPY . .
 
 ####################################################################################################
 
-FROM node:19-alpine as argo-ui
+FROM node:16-alpine as argo-ui
 
 RUN apk update && apk add --no-cache git
 
@@ -42,43 +45,34 @@ RUN --mount=type=cache,target=/root/.yarn \
 
 FROM builder as argoexec-build
 
-# Tell git to forget about all of the files that were not included because of .dockerignore in order to ensure that
-# the git state is "clean" even though said .dockerignore files are not present
-RUN cat .dockerignore >> .gitignore
-RUN git status --porcelain | cut -c4- | xargs git update-index --skip-worktree
+ARG GIT_COMMIT
+ARG GIT_TAG
+ARG GIT_TREE_STATE
 
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    make dist/argoexec
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make dist/argoexec GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE}
 
 ####################################################################################################
 
 FROM builder as workflow-controller-build
 
-# Tell git to forget about all of the files that were not included because of .dockerignore in order to ensure that
-# the git state is "clean" even though said .dockerignore files are not present
-RUN cat .dockerignore >> .gitignore
-RUN git status --porcelain | cut -c4- | xargs git update-index --skip-worktree
+ARG GIT_COMMIT
+ARG GIT_TAG
+ARG GIT_TREE_STATE
 
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    make dist/workflow-controller
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build make dist/workflow-controller GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE}
 
 ####################################################################################################
 
 FROM builder as argocli-build
 
+ARG GIT_COMMIT
+ARG GIT_TAG
+ARG GIT_TREE_STATE
+
 RUN mkdir -p ui/dist
 COPY --from=argo-ui ui/dist/app ui/dist/app
 
-# Tell git to forget about all of the files that were not included because of .dockerignore in order to ensure that
-# the git state is "clean" even though said .dockerignore files are not present
-RUN cat .dockerignore >> .gitignore
-RUN git status --porcelain | cut -c4- | xargs git update-index --skip-worktree
-
-RUN --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=cache,target=/root/.cache/go-build \
-    STATIC_FILES=true make dist/argo
+RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build STATIC_FILES=true make dist/argo GIT_COMMIT=${GIT_COMMIT} GIT_TAG=${GIT_TAG} GIT_TREE_STATE=${GIT_TREE_STATE}
 
 ####################################################################################################