Merge pull request #9676 from weseek/revert-9675-support/prepare-v1.0…

….0-pdf-converter.0

support: Revert pdf converter implement

.devcontainer/compose.yml

@@ -1,5 +1,5 @@
 services:
-  app:
+  node:
     image: mcr.microsoft.com/devcontainers/base:ubuntu
     volumes:
       - ..:/workspace/growi:delegated
@@ -8,7 +8,6 @@ services:
       - buildcache_app:/workspace/growi/apps/app/.next
       - ../../growi-docker-compose:/workspace/growi-docker-compose:delegated
       - ../../share:/workspace/share:delegated
-      - page_bulk_export_tmp:/tmp/page-bulk-export
     tty: true
     networks:
     - default
@@ -45,21 +44,10 @@ services:
       - /usr/share/elasticsearch/data
       - ../../growi-docker-compose/elasticsearch/v8/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
 
-  pdf-converter:
-    # enabling devcontainer 'features' was not working for secondary devcontainer (https://github.com/devcontainers/features/issues/1175)
-    image: mcr.microsoft.com/vscode/devcontainers/javascript-node:1-20
-    volumes:
-      - ..:/workspace/growi:delegated
-      - pnpm-store:/workspace/growi/.pnpm-store
-      - node_modules:/workspace/growi/node_modules
-      - page_bulk_export_tmp:/tmp/page-bulk-export
-    tty: true
-
 volumes:
   pnpm-store:
   node_modules:
   buildcache_app:
-  page_bulk_export_tmp:
 
 networks:
   default:

.devcontainer/app/devcontainer.json → .devcontainer/devcontainer.json

@@ -2,8 +2,8 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
 {
   "name": "GROWI-Dev",
-  "dockerComposeFile": "../compose.yml",
-  "service": "app",
+  "dockerComposeFile": "compose.yml",
+  "service": "node",
   "workspaceFolder": "/workspace/growi",
 
   "features": {
@@ -16,7 +16,7 @@
   // "forwardPorts": [],
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "/bin/bash ./.devcontainer/app/postCreateCommand.sh",
+  "postCreateCommand": "/bin/bash ./.devcontainer/postCreateCommand.sh",
 
   // Configure tool-specific properties.
   "customizations": {
@@ -37,10 +37,7 @@
         "vitest.explorer",
         "ms-playwright.playwright"
       ],
-      "settings": {
-        "terminal.integrated.defaultProfile.linux": "bash"
-      }
-    },
+    }
   },
 
   // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.