diff --git a/docker-compose.yml b/docker-compose.yml index dfbdc0a..84ad5be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,9 +9,14 @@ services: restart: unless-stopped ports: - 8091:3000 - working_dir: /usr/src/app + working_dir: /app volumes: - - ./:/usr/src/app - - ./node_modules:/usr/src/app/node_modules + - ./:/app + - ./src/:/app/src + - ./run.sh:/app/run.sh + - ./node_modules:/app/node_modules + - ./next:/app/.next + tty: true + stdin_open: true volumes: src: \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index 8115407..845ca98 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.20 +FROM alpine:3.19 -ENV NODE_VERSION 22.12.0 +ENV NODE_VERSION 18.20.4 RUN addgroup -g 1000 node \ && adduser -u 1000 -G node -s /bin/sh -D node \ @@ -10,7 +10,7 @@ RUN addgroup -g 1000 node \ curl \ && ARCH= OPENSSL_ARCH='linux*' && alpineArch="$(apk --print-arch)" \ && case "${alpineArch##*-}" in \ - x86_64) ARCH='x64' CHECKSUM="43532120bad06cdea17c2ffba81ebfcff4611532a3569ef996faa39aadcbc759" OPENSSL_ARCH=linux-x86_64;; \ + x86_64) ARCH='x64' CHECKSUM="ac4fe3bef38d5e4ecf172b46c8af1f346904afd9788ce12919e3696f601e191e" OPENSSL_ARCH=linux-x86_64;; \ x86) OPENSSL_ARCH=linux-elf;; \ aarch64) OPENSSL_ARCH=linux-aarch64;; \ arm*) OPENSSL_ARCH=linux-armv4;; \ @@ -41,14 +41,18 @@ RUN addgroup -g 1000 node \ && export GNUPGHOME="$(mktemp -d)" \ # gpg keys listed at https://github.com/nodejs/node#release-keys && for key in \ - C0D6248439F1D5604AAFFB4021D900FFDB233756 \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ - CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 61FC681DFB92A079F1685E77973F295594EC4689 \ 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \ 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ 108F52B48DB57BB0CC439B2997B01419BD92F80A \ A363A499291CBBC940DD62E41F10027AF002F8B0 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ ; do \ gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ @@ -77,7 +81,7 @@ RUN addgroup -g 1000 node \ && node --version \ && npm --version -ENV YARN_VERSION 1.22.22 +ENV YARN_VERSION 1.22.19 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 @@ -103,27 +107,37 @@ RUN apk add --no-cache --virtual .build-deps-yarn curl gnupg tar \ && yarn --version \ && rm -rf /tmp/* -COPY docker-entrypoint.sh /usr/local/bin/ +# COPY docker-entrypoint.sh /usr/local/bin/ # ENTRYPOINT ["docker-entrypoint.sh"] -WORKDIR /usr/src/app +RUN mkdir -p /app + +# set working directory +WORKDIR /app + +# add `/app/node_modules/.bin` to $PATH +ENV PATH /app/node_modules/.bin:$PATH # install app dependencies -COPY package.json /usr/src/app - -# add app -COPY . ./usr/src/app - -# install app dependencies -RUN npm install -RUN npm install react-scripts +COPY package.json /app +#COPY package-lock.json /app +RUN npm install --silent +#RUN npm install react-scripts@3.4.1 -g --silent +#RUN npm install -g serve RUN npm install -g next RUN npm install sharp -RUN npm install react-modal-video -RUN npm install wowjs +# add app +COPY . /app +# build app +#RUN npm run-script build +# start app +#CMD ["serve", "-s", "build"] +#CMD ["npm", "run", "dev"] + +#RUN npm run build +#CMD ["npm", "run", "start"] +CMD ["sh", "-c", "next build && next start"] -#CMD ["sh", "-c", "next build && next start"] -CMD [ "npm" ,"run","dev"] \ No newline at end of file