Browse Source

Merge pull request #9560 from weseek/feat/159784-160492-configure-bulk-export-shared-volume-in-dockerfile

configure bulk export shared volume in dockerfile
Yuki Takei 1 year ago
parent
commit
c7cd9b8a21

+ 5 - 1
apps/app/docker/docker-entrypoint.sh

@@ -7,8 +7,12 @@ mkdir -p /data/uploads
 if [ ! -e "./public/uploads" ]; then
   ln -s /data/uploads ./public/uploads
 fi
-
 chown -R node:node /data/uploads
 chown -h node:node ./public/uploads
 
+# Set permissions for shared directory for bulk export
+mkdir -p /tmp/page-bulk-export
+chown -R node:node /tmp/page-bulk-export
+chmod 700 /tmp/page-bulk-export
+
 exec gosu node /bin/bash -c "$@"

+ 4 - 1
apps/pdf-converter/docker/Dockerfile

@@ -34,6 +34,7 @@ COPY . .
 RUN pnpm install ---frozen-lockfile
 
 # build
+RUN turbo run clean
 RUN turbo run build --filter @growi/pdf-converter
 
 # make artifacts
@@ -73,8 +74,10 @@ USER node
 WORKDIR ${appDir}
 RUN tar -xf packages.tar.gz && rm packages.tar.gz
 
+COPY --chown=node:node --chmod=700 apps/pdf-converter/docker/docker-entrypoint.sh /
+
 WORKDIR ${appDir}/apps/pdf-converter
 
 EXPOSE 3010
 
-CMD ["node", "dist/index.js"]
+ENTRYPOINT ["/docker-entrypoint.sh"]

+ 10 - 0
apps/pdf-converter/docker/docker-entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# Set permissions for shared directory for bulk export
+mkdir -p /tmp/page-bulk-export
+chown -R node:node /tmp/page-bulk-export
+chmod 700 /tmp/page-bulk-export
+
+node dist/index.js