From ede87a18da908589df2df061d5113fcdfcb0c577 Mon Sep 17 00:00:00 2001 From: chenos Date: Wed, 27 Nov 2024 11:36:36 +0800 Subject: [PATCH] chore: update Dockerfile --- Dockerfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 42add52232..bbb01d364c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG BEFORE_PACK_NOCOBASE="ls -l" ARG PLUGINS_DIRS ENV PLUGINS_DIRS=${PLUGINS_DIRS} -ENV COMMIT_HASH=${COMMIT_HASH} + RUN npx npm-cli-adduser --username test --password test -e test@nocobase.com -r $VERDACCIO_URL @@ -46,19 +46,23 @@ RUN cd /app \ && rm -rf nocobase.tar.gz \ && tar -zcf ./nocobase.tar.gz -C /app/my-nocobase-app . -RUN echo "${COMMIT_HASH}" > /tmp/commit_hash.txt - FROM node:20.13-bullseye-slim -RUN apt-get update && apt-get install -y nginx libaio1 -RUN rm -rf /etc/nginx/sites-enabled/default +RUN apt-get update && apt-get install -y nginx libaio1 \ + && apt-get install -y --no-install-recommends postgresql-common gnupg \ + && /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y \ + && apt-get install -y --no-install-recommends postgresql-client-16 \ + && 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 -COPY --from=builder /tmp/commit_hash.txt /app/commit_hash.txt WORKDIR /app/nocobase +RUN mkdir -p /app/nocobase/storage/uploads/ && echo "$COMMIT_HASH" >> /app/nocobase/storage/uploads/COMMIT_HASH + COPY ./docker/nocobase/docker-entrypoint.sh /app/ CMD ["/app/docker-entrypoint.sh"]