From 7a745964c478884ec8c4b0d42a49b9b0236f79ad Mon Sep 17 00:00:00 2001
From: ameye <ses66181@gmail.com>
Date: Sun, 26 Apr 2026 04:30:05 -0400
Subject: [PATCH] fix build

---
 .dockerignore      |  4 ++++
 docker-compose.yml |  3 ++-
 docker/Dockerfile  | 59 +++++++++++++++++++++++-----------------------
 next.config.js     |  6 ++---
 4 files changed, 38 insertions(+), 34 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..ba2800b
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+node_modules
+.next
+.git
+*.log
diff --git a/docker-compose.yml b/docker-compose.yml
index 5788347..fbc6595 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     working_dir: /app
     volumes:
       - .:/app
-      - ./node_modules:/app_backup/node_modules
+      - node_modules:/app/node_modules
 #      - ./run.sh:/app/run.sh
 #      - ./next:/app/.next
     image: registry.chiefsoft.net/merms-web-2025:latest
@@ -24,3 +24,4 @@ services:
       - NODE_ENV=${NODE_ENV:-live}
 volumes:
   src:
+  node_modules:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 01ea6c4..7e9d3e0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
-FROM alpine:3.20
+FROM alpine:3.22
 
-ENV NODE_VERSION 22.12.0
+ENV NODE_VERSION=22.12.0
 
 RUN addgroup -g 1000 node \
     && adduser -u 1000 -G node -s /bin/sh -D node \
@@ -77,31 +77,31 @@ RUN addgroup -g 1000 node \
   && node --version \
   && npm --version
 
-ENV YARN_VERSION 1.22.22
+# ENV YARN_VERSION 1.22.22
 
-RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
-  # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
-  && export GNUPGHOME="$(mktemp -d)" \
-  && for key in \
-    6A010C5166006599AA17F08146C2130DFD2497F5 \
-  ; do \
-    gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
-    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
-  done \
-  && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
-  && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
-  && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
-  && gpgconf --kill all \
-  && rm -rf "$GNUPGHOME" \
-  && mkdir -p /opt \
-  && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
-  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
-  && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
-  && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
-  && apk del .build-deps-yarn \
-  # smoke test
-  && yarn --version \
-  && rm -rf /tmp/*
+# RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \
+#   # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
+#   && export GNUPGHOME="$(mktemp -d)" \
+#   && for key in \
+#     6A010C5166006599AA17F08146C2130DFD2497F5 \
+#   ; do \
+#     gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
+#     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
+#   done \
+#   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
+#   && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
+#   && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+#   && gpgconf --kill all \
+#   && rm -rf "$GNUPGHOME" \
+#   && mkdir -p /opt \
+#   && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
+#   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+#   && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
+#   && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+#   && apk del .build-deps-yarn \
+#   # smoke test
+#   && yarn --version \
+#   && rm -rf /tmp/*
 
 COPY docker-entrypoint.sh /usr/local/bin/
 # ENTRYPOINT ["docker-entrypoint.sh"]
@@ -118,19 +118,18 @@ COPY package.json /app/
 # Install app dependencies
 RUN npm install --save
 RUN npm install react-scripts
-RUN npm install -g next
 RUN npm install sharp
 RUN npm install react-modal-video
 RUN npm install wowjs
 
 # Bundle app source
 COPY . /app
-RUN cp -a /app/. /app_backup
+# RUN cp -a /app/. /app_backup
 
 RUN chmod a+x /usr/local/bin/docker-entrypoint.sh
 
 EXPOSE 3000
 ENTRYPOINT [ "/usr/local/bin/docker-entrypoint.sh" ]
 
-#CMD ["sh", "-c", "next build && next start"]
-CMD [ "npm" ,"run","dev"]
+CMD ["sh", "-c", "npm run build && npm run start"]
+# CMD [ "npm" ,"run","dev"]
diff --git a/next.config.js b/next.config.js
index 374fc7f..11c0076 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,9 +1,9 @@
 /** @type {import('next').NextConfig} */
+const path = require('path')
+
 const nextConfig = {
   reactStrictMode: true,
-  experimental: {
-    serverActions: true,
-  },
+  outputFileTracingRoot: path.join(__dirname),
 }
 
 module.exports = nextConfig