Просмотр исходного кода

set permission for bulk export shared directory in entrypoint

Futa Arai 1 год назад
Родитель
Сommit
d9f9146905

+ 0 - 3
apps/app/docker/Dockerfile

@@ -71,9 +71,6 @@ ENV NODE_ENV="production"
 ENV optDir=/opt
 ENV appDir=${optDir}/growi
 
-# create shared directory for bulk export and set permission
-RUN mkdir -p /tmp/page-bulk-export && chown -R node:node /tmp/page-bulk-export && chmod 700 /tmp/page-bulk-export
-
 # Add gosu
 # see: https://github.com/tianon/gosu/blob/1.13/INSTALL.md
 RUN set -eux; \

+ 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 "$@"

+ 2 - 3
apps/pdf-converter/docker/Dockerfile

@@ -62,9 +62,6 @@ ENV LANG="ja_JP.UTF-8"
 ENV optDir="/opt"
 ENV appDir="${optDir}/pdf-converter"
 
-# create shared directory for bulk export and set permission
-RUN mkdir -p /tmp/page-bulk-export && chown -R node:node /tmp/page-bulk-export && chmod 700 /tmp/page-bulk-export
-
 RUN apt-get update && apt-get install -y chromium fonts-lato fonts-ipafont-gothic fonts-noto-cjk \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*;
@@ -77,6 +74,8 @@ 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

+ 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
+
+exec /bin/bash -c "$@"