From 3d5055cc327f8c77ac74cfe870442cc150faa0dd Mon Sep 17 00:00:00 2001
From: MohamedBassem <me@mbassem.com>
Date: Tue, 2 Apr 2024 16:46:08 +0100
Subject: docker: Move build args to the end for better cache hits

---
 docker/Dockerfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 948e70ef..a3f2eda6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -34,9 +34,6 @@ RUN pnpm next experimental-compile
 FROM --platform=$BUILDPLATFORM node:21-alpine AS web
 WORKDIR /app
 
-ARG SERVER_VERSION=nightly
-ENV SERVER_VERSION=${SERVER_VERSION}
-
 ENV NODE_ENV production
 ENV NEXT_TELEMETRY_DISABLED 1
 
@@ -60,6 +57,9 @@ ENV PORT 3000
 # set hostname to localhost
 ENV HOSTNAME "0.0.0.0"
 
+ARG SERVER_VERSION=nightly
+ENV SERVER_VERSION=${SERVER_VERSION}
+
 # server.js is created by next build from the standalone output
 # https://nextjs.org/docs/pages/api-reference/next-config-js/output
 CMD ["/bin/sh", "-c", "(cd /db_migrations && node index.js) && node server.js"]
@@ -75,9 +75,6 @@ RUN --mount=type=cache,id=pnpm_workers,target=/pnpm/store pnpm deploy --node-lin
 FROM --platform=$BUILDPLATFORM node:21-alpine AS workers
 WORKDIR /app
 
-ARG SERVER_VERSION=nightly
-ENV SERVER_VERSION=${SERVER_VERSION}
-
 COPY --from=workers_builder /prod apps/workers
 
 RUN corepack enable
@@ -86,6 +83,9 @@ WORKDIR /app/apps/workers
 
 USER root
 
+ARG SERVER_VERSION=nightly
+ENV SERVER_VERSION=${SERVER_VERSION}
+
 CMD ["pnpm", "run", "start:prod"]
 
 ################# The cli builder ##############
@@ -99,8 +99,6 @@ RUN --mount=type=cache,id=pnpm_cli,target=/pnpm/store pnpm deploy --node-linker=
 FROM --platform=$BUILDPLATFORM node:21-alpine AS cli
 WORKDIR /app
 
-ARG SERVER_VERSION=nightly
-ENV SERVER_VERSION=${SERVER_VERSION}
 
 COPY --from=cli_builder /prod apps/cli
 
@@ -108,4 +106,7 @@ RUN corepack enable
 
 WORKDIR /app/apps/cli
 
+ARG SERVER_VERSION=nightly
+ENV SERVER_VERSION=${SERVER_VERSION}
+
 ENTRYPOINT ["pnpm" , "exec", "tsx", "index.ts"]
-- 
cgit v1.2.3-70-g09d2