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

remove SYS_ADMIN config and chromium-sandbox installation from pdf-converter

Futa Arai 8 месяцев назад
Родитель
Сommit
7e93b4ed59

+ 0 - 2
.devcontainer/compose.extend.template.yml

@@ -10,5 +10,3 @@ services:
       - node_modules:/workspace/growi/node_modules
       - page_bulk_export_tmp:/tmp/page-bulk-export
     tty: true
-    cap_add:
-      - SYS_ADMIN

+ 1 - 1
.devcontainer/pdf-converter/postCreateCommand.sh

@@ -1,7 +1,7 @@
 # Instal additional packages
 sudo apt update
 sudo apt-get install -y --no-install-recommends \
-  chromium chromium-sandbox fonts-lato fonts-ipafont-gothic fonts-noto-cjk
+  chromium fonts-lato fonts-ipafont-gothic fonts-noto-cjk
 sudo apt-get clean -y
 
 # Set permissions for shared directory for bulk export

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

@@ -15,7 +15,7 @@ WORKDIR $OPT_DIR
 
 # install tools
 RUN --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,target=/var/cache/apt,sharing=locked \
   apt-get update && apt-get install -y ca-certificates wget --no-install-recommends
 
 # install pnpm
@@ -75,11 +75,11 @@ ENV LANG="ja_JP.UTF-8"
 ENV appDir="$OPT_DIR/pdf-converter"
 
 RUN --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    --mount=type=cache,target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,target=/var/cache/apt,sharing=locked \
   apt-get update; \
-  apt-get install -y chromium chromium-sandbox fonts-lato fonts-ipafont-gothic fonts-noto-cjk gosu; \
+  apt-get install -y chromium fonts-lato fonts-ipafont-gothic fonts-noto-cjk gosu; \
   rm -rf /var/lib/apt/lists/*; \
-# verify that the binary works
+  # verify that the binary works
   gosu nobody true
 
 # extract artifacts as 'node' user