From cad134f6efd0dbf5733a5c6f73094b96cd2a5896 Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Fri, 10 Jan 2025 11:26:24 +0800
Subject: [PATCH] chore: update Dockerfile

---
 Dockerfile                 | 17 +++++---
 docker/nocobase/Dockerfile | 79 +++++++++++++++++++++++++++-----------
 2 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a94d3e8f45..662dfdbdb2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.13-bullseye as builder
+FROM node:20-bookworm as builder
 ARG VERDACCIO_URL=http://host.docker.internal:10104/
 ARG COMMIT_HASH
 ARG APPEND_PRESET_LOCAL_PLUGINS
@@ -7,10 +7,17 @@ ARG PLUGINS_DIRS
 
 ENV PLUGINS_DIRS=${PLUGINS_DIRS}
 
+RUN apt-get update && apt-get install -y jq expect
 
-RUN npx npm-cli-adduser --username test --password test -e test@nocobase.com -r $VERDACCIO_URL
+RUN expect <<EOD
+spawn npm adduser --registry $VERDACCIO_URL
+expect {
+  "Username:" {send "test\r"; exp_continue}
+  "Password:" {send "test\r"; exp_continue}
+  "Email: (this IS public)" {send "test@nocobase.com\r"; exp_continue}
+}
+EOD
 
-RUN apt-get update && apt-get install -y jq
 WORKDIR /tmp
 COPY . /tmp
 RUN  yarn install && yarn build --no-dts
@@ -47,12 +54,12 @@ RUN cd /app \
   && tar -zcf ./nocobase.tar.gz -C /app/my-nocobase-app .
 
 
-FROM node:20.13-bullseye-slim
+FROM node:20-bookworm-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends wget gnupg \
   && rm -rf /var/lib/apt/lists/*
 
-RUN sh -c 'echo "deb http://mirrors.ustc.edu.cn/postgresql/repos/apt bullseye-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+RUN sh -c 'echo "deb http://mirrors.ustc.edu.cn/postgresql/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 RUN wget --quiet -O - http://mirrors.ustc.edu.cn/postgresql/repos/apt/ACCC4CF8.asc | apt-key add -
 
 RUN apt-get update && apt-get -y --no-install-recommends install nginx libaio1 postgresql-client-16 postgresql-client-17 \
diff --git a/docker/nocobase/Dockerfile b/docker/nocobase/Dockerfile
index 41841cb7d5..662dfdbdb2 100644
--- a/docker/nocobase/Dockerfile
+++ b/docker/nocobase/Dockerfile
@@ -1,45 +1,78 @@
-FROM node:18-bullseye-slim as builder
+FROM node:20-bookworm as builder
+ARG VERDACCIO_URL=http://host.docker.internal:10104/
+ARG COMMIT_HASH
+ARG APPEND_PRESET_LOCAL_PLUGINS
+ARG BEFORE_PACK_NOCOBASE="ls -l"
+ARG PLUGINS_DIRS
 
-ARG CNA_VERSION
+ENV PLUGINS_DIRS=${PLUGINS_DIRS}
 
+RUN apt-get update && apt-get install -y jq expect
+
+RUN expect <<EOD
+spawn npm adduser --registry $VERDACCIO_URL
+expect {
+  "Username:" {send "test\r"; exp_continue}
+  "Password:" {send "test\r"; exp_continue}
+  "Email: (this IS public)" {send "test@nocobase.com\r"; exp_continue}
+}
+EOD
+
+WORKDIR /tmp
+COPY . /tmp
+RUN  yarn install && yarn build --no-dts
+
+SHELL ["/bin/bash", "-c"]
+
+RUN CURRENTVERSION="$(jq -r '.version' lerna.json)" && \
+  IFS='.-' read -r major minor patch label <<< "$CURRENTVERSION" && \
+  if [ -z "$label" ]; then CURRENTVERSION="$CURRENTVERSION-rc"; fi && \
+  cd /tmp && \
+  NEWVERSION="$(echo $CURRENTVERSION).$(date +'%Y%m%d%H%M%S')" \
+  &&  git checkout -b release-$(date +'%Y%m%d%H%M%S') \
+  && yarn lerna version ${NEWVERSION} -y --no-git-tag-version
+
+RUN git config user.email "test@mail.com"  \
+    && git config user.name "test" && git add .  \
+    && git commit -m "chore(versions): test publish packages"
+RUN yarn release:force --registry $VERDACCIO_URL
+
+RUN yarn config set registry $VERDACCIO_URL
 WORKDIR /app
-
 RUN cd /app \
   && yarn config set network-timeout 600000 -g \
-  && npx -y create-nocobase-app@${CNA_VERSION} my-nocobase-app -a -e APP_ENV=production \
+  && yarn create nocobase-app my-nocobase-app -a -e APP_ENV=production -e APPEND_PRESET_LOCAL_PLUGINS=$APPEND_PRESET_LOCAL_PLUGINS \
   && cd /app/my-nocobase-app \
   && yarn install --production
 
+WORKDIR /app/my-nocobase-app
+RUN $BEFORE_PACK_NOCOBASE
+
 RUN cd /app \
+  && rm -rf my-nocobase-app/packages/app/client/src/.umi \
   && rm -rf nocobase.tar.gz \
   && tar -zcf ./nocobase.tar.gz -C /app/my-nocobase-app .
 
-FROM node:18-bullseye-slim
 
-# COPY ./sources.list /etc/apt/sources.list
-RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
-  && case "${dpkgArch##*-}" in \
-  amd64) ARCH='x64';; \
-  ppc64el) ARCH='ppc64le';; \
-  s390x) ARCH='s390x';; \
-  arm64) ARCH='arm64';; \
-  armhf) ARCH='armv7l';; \
-  i386) ARCH='x86';; \
-  *) echo "unsupported architecture"; exit 1 ;; \
-  esac \
-  && set -ex \
-  # libatomic1 for arm
-  && apt-get update && apt-get install -y nginx libaio1
+FROM node:20-bookworm-slim
+
+RUN apt-get update && apt-get install -y --no-install-recommends wget gnupg \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN sh -c 'echo "deb http://mirrors.ustc.edu.cn/postgresql/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+RUN wget --quiet -O - http://mirrors.ustc.edu.cn/postgresql/repos/apt/ACCC4CF8.asc | apt-key add -
+
+RUN apt-get update && apt-get -y --no-install-recommends install nginx libaio1 postgresql-client-16 postgresql-client-17 \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /etc/nginx/sites-enabled/default
+COPY ./docker/nocobase/nocobase.conf /etc/nginx/sites-enabled/nocobase.conf
 COPY --from=builder /app/nocobase.tar.gz /app/nocobase.tar.gz
 
 WORKDIR /app/nocobase
 
-COPY docker-entrypoint.sh /app/
-# COPY docker-entrypoint.sh /usr/local/bin/
-# ENTRYPOINT ["docker-entrypoint.sh"]
+RUN mkdir -p /app/nocobase/storage/uploads/ && echo "$COMMIT_HASH" >> /app/nocobase/storage/uploads/COMMIT_HASH
 
-EXPOSE 80/tcp
+COPY ./docker/nocobase/docker-entrypoint.sh /app/
 
 CMD ["/app/docker-entrypoint.sh"]