From 81af23ecb5fc1a518ff1f51f9170110915cb71e5 Mon Sep 17 00:00:00 2001
From: Ben Phelps <ben@phelps.io>
Date: Wed, 14 Sep 2022 19:19:02 +0300
Subject: [PATCH] revert to previous Dockerfile

---
 Dockerfile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ab7e12725..b1193813c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:latest
 
 # Install dependencies only when needed
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15 AS deps
+FROM node:current-alpine AS deps
 
 WORKDIR /app
 
@@ -9,9 +9,9 @@ COPY --link package.json pnpm-lock.yaml* ./
 
 RUN <<EOF
     set -xe
-    apk add nodejs npm libc6-compat tzdata
+    apk add libc6-compat
     apk add --virtual .gyp python3 make g++
-    npm install -g pnpm
+    yarn global add pnpm
 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"
@@ -27,7 +27,7 @@ COPY . .
 
 RUN <<EOF
     set -xe
-    npm run telemetry
+    yarn next telemetry disable
     mkdir config && echo '-' > config/settings.yaml
     npm run build
 EOF
@@ -42,9 +42,8 @@ LABEL org.opencontainers.image.source='https://github.com/benphelps/homepage'
 LABEL org.opencontainers.image.licenses='Apache-2.0'
 
 ENV NODE_ENV production
-WORKDIR /app
 
-ADD docker-entrypoint.sh docker-entrypoint.sh
+WORKDIR /app
 
 # Copy files from context (this allows the files to copy before the builder stage is done).
 COPY --link package.json next.config.js ./
@@ -60,4 +59,4 @@ 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
 
-ENTRYPOINT ["/app/docker-entrypoint.sh"]
+CMD ["node", "server.js"]