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

use image with node for base image of pdf-converter and remove features

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

+ 1 - 1
.devcontainer/compose.yml

@@ -42,7 +42,7 @@ services:
       - ../../growi-docker-compose/elasticsearch/v8/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
 
   pdf-converter:
-    image: mcr.microsoft.com/devcontainers/base:ubuntu
+    image: mcr.microsoft.com/vscode/devcontainers/javascript-node:0-20
     volumes:
       - ..:/workspace/growi:delegated
       - pnpm-store:/workspace/growi/.pnpm-store

+ 0 - 6
.devcontainer/pdf-converter/devcontainer.json

@@ -4,12 +4,6 @@
   "service": "pdf-converter",
   "workspaceFolder": "/workspace/growi",
 
-  "features": {
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "20.18.0"
-    }
-  },
-
   // Use 'forwardPorts' to make a list of ports inside the container available locally.
   // "forwardPorts": [],
 

+ 3 - 4
.devcontainer/pdf-converter/postCreateCommand.sh

@@ -1,14 +1,13 @@
-sudo chown -R vscode:vscode /workspace;
-
 # Instal additional packages
 sudo apt update
 sudo apt-get install -y --no-install-recommends \
-  chromium-browser locales fonts-ipafont fonts-ipaexfont fonts-ipafont-gothic fonts-ipafont-mincho
+  chromium locales fonts-ipafont fonts-ipaexfont fonts-ipafont-gothic fonts-ipafont-mincho
 sudo apt-get clean -y
 
 # Setup pnpm
 SHELL=bash pnpm setup
-eval "$(cat /home/vscode/.bashrc)"
+eval "$(cat /home/node/.bashrc)"
+pnpm add -g pnpm
 
 # Install turbo
 pnpm install turbo --global