From a265038bf6e8bf56ce7c6a98d58337ae436028af Mon Sep 17 00:00:00 2001
From: Alex <modem7@gmail.com>
Date: Mon, 5 Sep 2022 16:42:10 +0100
Subject: [PATCH 1/6] Update Dockerfile

---
 Dockerfile | 57 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 255b45f8..65d49570 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,33 @@
-FROM node:16-alpine AS base
+# syntax = docker/dockerfile:latest
+
+# Install dependencies only when needed
+FROM node:16-alpine AS deps
+
+WORKDIR /app
+
+COPY package.json pnpm-lock.yaml* ./
+
+RUN <<EOF
+    set -xe
+    apk add --no-cache libc6-compat
+    apk add --no-cache --virtual .gyp python3 make g++
+    yarn global add pnpm
+    pnpm install
+EOF
+
+# Rebuild the source code only when needed
+FROM node:16-alpine AS builder
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY . .
+RUN <<EOF
+    set -xe
+    yarn next telemetry disable
+    npm run build
+EOF
+
+# Production image, copy all the files and run next
+FROM node:16-alpine AS runner
 LABEL org.opencontainers.image.title "Homepage"
 LABEL org.opencontainers.image.description "A self-hosted services landing page, with docker and service integrations."
 LABEL org.opencontainers.image.url="https://github.com/benphelps/homepage"
@@ -6,31 +35,13 @@ LABEL org.opencontainers.image.documentation='https://github.com/benphelps/homep
 LABEL org.opencontainers.image.source='https://github.com/benphelps/homepage'
 LABEL org.opencontainers.image.licenses='Apache-2.0'
 
-# Install dependencies only when needed
-FROM node:16-alpine AS deps
-RUN apk add --no-cache libc6-compat
-RUN apk add --no-cache --virtual .gyp python3 make g++
-WORKDIR /app
-COPY package.json pnpm-lock.yaml* ./
-RUN yarn global add pnpm
-RUN pnpm install
-RUN apk del .gyp
-
-# Rebuild the source code only when needed
-FROM node:16-alpine AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-RUN npm run build
-
-# Production image, copy all the files and run next
-FROM node:16-alpine AS runner
-WORKDIR /app
 ENV NODE_ENV production
-COPY --from=builder /app/next.config.js ./
+
+WORKDIR /app
+
+COPY --from=builder /app/next.config.js /app/.next/standalone ./
 COPY --from=builder /app/public ./public
 COPY --from=builder /app/package.json ./package.json
-COPY --from=builder /app/.next/standalone ./
 COPY --from=builder /app/.next/static ./.next/static
 
 EXPOSE 3000

From 78c52861c7bdfcc9404f4914cbf295ded7d6e967 Mon Sep 17 00:00:00 2001
From: Alex <modem7@gmail.com>
Date: Mon, 5 Sep 2022 19:44:58 +0100
Subject: [PATCH 2/6] Update Dockerfile for --link

---
 Dockerfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 65d49570..68ce887c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,16 @@ FROM node:16-alpine AS deps
 
 WORKDIR /app
 
-COPY package.json pnpm-lock.yaml* ./
+COPY --link package.json pnpm-lock.yaml* ./
 
 RUN <<EOF
     set -xe
     apk add --no-cache libc6-compat
     apk add --no-cache --virtual .gyp python3 make g++
+EOF
+
+RUN <<EOF
+    set -xe
     yarn global add pnpm
     pnpm install
 EOF
@@ -18,8 +22,10 @@ EOF
 # Rebuild the source code only when needed
 FROM node:16-alpine AS builder
 WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
+
+COPY --link --from=deps /app/node_modules ./node_modules/
 COPY . .
+
 RUN <<EOF
     set -xe
     yarn next telemetry disable
@@ -39,10 +45,10 @@ ENV NODE_ENV production
 
 WORKDIR /app
 
-COPY --from=builder /app/next.config.js /app/.next/standalone ./
-COPY --from=builder /app/public ./public
-COPY --from=builder /app/package.json ./package.json
-COPY --from=builder /app/.next/static ./.next/static
+COPY --link --from=builder /app/next.config.js /app/.next/standalone ./
+COPY --link --from=builder /app/public ./public/
+COPY --link --from=builder /app/package.json ./package.json
+COPY --link --from=builder /app/.next/static ./.next/static/
 
 EXPOSE 3000
 ENV PORT 3000

From fb845c3e033f7558bf9a06634430366609d7e5dd Mon Sep 17 00:00:00 2001
From: Alex <modem7@gmail.com>
Date: Mon, 5 Sep 2022 22:17:58 +0100
Subject: [PATCH 3/6] Update Dockerfile and add healthcheck

---
 Dockerfile     | 15 +++++++++++----
 healthcheck.js | 19 +++++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100755 healthcheck.js

diff --git a/Dockerfile b/Dockerfile
index 68ce887c..026189dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,10 +45,17 @@ ENV NODE_ENV production
 
 WORKDIR /app
 
-COPY --link --from=builder /app/next.config.js /app/.next/standalone ./
-COPY --link --from=builder /app/public ./public/
-COPY --link --from=builder /app/package.json ./package.json
-COPY --link --from=builder /app/.next/static ./.next/static/
+# Copy files from context
+COPY --link package.json next.config.js ./
+COPY --link --chmod=755 healthcheck.js ./
+COPY --link /public ./public
+
+# Copy files from builder
+COPY --link --from=builder /app/.next/standalone ./
+COPY --link --from=builder /app/.next/static/ ./.next/static/
+
+HEALTHCHECK --interval=12s --timeout=12s --start-period=30s \  
+    CMD node ./healthcheck.js
 
 EXPOSE 3000
 ENV PORT 3000
diff --git a/healthcheck.js b/healthcheck.js
new file mode 100755
index 00000000..8e2301f8
--- /dev/null
+++ b/healthcheck.js
@@ -0,0 +1,19 @@
+var http = require("http");
+var options = {
+  host: "localhost",
+  port: "3000",
+  timeout: 2000,
+};
+var request = http.request(options, (res) => {
+  console.log(`STATUS: ${res.statusCode}`);
+  if (res.statusCode == 200) {
+    process.exit(0);
+  } else {
+    process.exit(1);
+  }
+});
+request.on("error", function (err) {
+  console.log("ERROR");
+  process.exit(1);
+});
+request.end();
\ No newline at end of file

From 36d1a9c7385c49010cfb55466e976b42ae3ca07b Mon Sep 17 00:00:00 2001
From: Alex <modem7@gmail.com>
Date: Mon, 5 Sep 2022 22:55:14 +0100
Subject: [PATCH 4/6] Update healthcheck to work with PORT variable

---
 Dockerfile     | 5 +++--
 healthcheck.js | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 026189dd..3fa1367f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,9 +54,10 @@ COPY --link /public ./public
 COPY --link --from=builder /app/.next/standalone ./
 COPY --link --from=builder /app/.next/static/ ./.next/static/
 
+EXPOSE 3000
+ENV PORT='3000'
+
 HEALTHCHECK --interval=12s --timeout=12s --start-period=30s \  
     CMD node ./healthcheck.js
 
-EXPOSE 3000
-ENV PORT 3000
 CMD ["node", "server.js"]
diff --git a/healthcheck.js b/healthcheck.js
index 8e2301f8..cd9b288a 100755
--- a/healthcheck.js
+++ b/healthcheck.js
@@ -1,7 +1,10 @@
 var http = require("http");
+
+const PORT = process.env.PORT || "3000";
+
 var options = {
   host: "localhost",
-  port: "3000",
+  port: PORT,
   timeout: 2000,
 };
 var request = http.request(options, (res) => {
@@ -16,4 +19,4 @@ request.on("error", function (err) {
   console.log("ERROR");
   process.exit(1);
 });
-request.end();
\ No newline at end of file
+request.end();

From b023801fe4e9e0d1bb83849c190f7c90957b8426 Mon Sep 17 00:00:00 2001
From: Alex <modem7@gmail.com>
Date: Tue, 6 Sep 2022 21:39:31 +0100
Subject: [PATCH 5/6] Update Dockerfile to include cache mounts + update
 healthcheck to new endpoint

---
 Dockerfile     | 27 +++++++++++++--------------
 healthcheck.js | 22 ----------------------
 2 files changed, 13 insertions(+), 36 deletions(-)
 delete mode 100755 healthcheck.js

diff --git a/Dockerfile b/Dockerfile
index 3fa1367f..ca819d24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,17 +7,17 @@ WORKDIR /app
 
 COPY --link package.json pnpm-lock.yaml* ./
 
-RUN <<EOF
+RUN --mount=type=cache,id=apk,sharing=locked,target=/var/cache/apk \
+    <<EOF
     set -xe
-    apk add --no-cache libc6-compat
-    apk add --no-cache --virtual .gyp python3 make g++
+    apk add libc6-compat
+    apk add --virtual .gyp python3 make g++
+    yarn global add pnpm
 EOF
 
-RUN <<EOF
-    set -xe
-    yarn global add pnpm
-    pnpm install
-EOF
+RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store pnpm fetch | grep -v "cross-device link not permitted\|Falling back to copying packages from store"
+
+RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store pnpm install -r --offline
 
 # Rebuild the source code only when needed
 FROM node:16-alpine AS builder
@@ -45,9 +45,8 @@ ENV NODE_ENV production
 
 WORKDIR /app
 
-# Copy files from context
+# Copy files from context (this allows the files to copy before the builder stage is done).
 COPY --link package.json next.config.js ./
-COPY --link --chmod=755 healthcheck.js ./
 COPY --link /public ./public
 
 # Copy files from builder
@@ -55,9 +54,9 @@ COPY --link --from=builder /app/.next/standalone ./
 COPY --link --from=builder /app/.next/static/ ./.next/static/
 
 EXPOSE 3000
-ENV PORT='3000'
+ENV PORT 3000
 
-HEALTHCHECK --interval=12s --timeout=12s --start-period=30s \  
-    CMD node ./healthcheck.js
+HEALTHCHECK --interval=10s --timeout=3s --start-period=20s \
+  CMD wget --no-verbose --tries=1 --spider --no-check-certificate http://localhost:$PORT/api/healthcheck || exit 1
 
-CMD ["node", "server.js"]
+CMD ["node", "server.js"]
\ No newline at end of file
diff --git a/healthcheck.js b/healthcheck.js
deleted file mode 100755
index cd9b288a..00000000
--- a/healthcheck.js
+++ /dev/null
@@ -1,22 +0,0 @@
-var http = require("http");
-
-const PORT = process.env.PORT || "3000";
-
-var options = {
-  host: "localhost",
-  port: PORT,
-  timeout: 2000,
-};
-var request = http.request(options, (res) => {
-  console.log(`STATUS: ${res.statusCode}`);
-  if (res.statusCode == 200) {
-    process.exit(0);
-  } else {
-    process.exit(1);
-  }
-});
-request.on("error", function (err) {
-  console.log("ERROR");
-  process.exit(1);
-});
-request.end();

From 8e2bebcfd91854207b32f8d108934a9473f95a87 Mon Sep 17 00:00:00 2001
From: Alex <modem7@gmail.com>
Date: Tue, 6 Sep 2022 21:41:53 +0100
Subject: [PATCH 6/6] Updated EXPOSE to variable

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ca819d24..065135bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,8 +53,8 @@ COPY --link /public ./public
 COPY --link --from=builder /app/.next/standalone ./
 COPY --link --from=builder /app/.next/static/ ./.next/static/
 
-EXPOSE 3000
 ENV PORT 3000
+EXPOSE $PORT
 
 HEALTHCHECK --interval=10s --timeout=3s --start-period=20s \
   CMD wget --no-verbose --tries=1 --spider --no-check-certificate http://localhost:$PORT/api/healthcheck || exit 1