commit a883703070f3d62b6c922ac9af509590a0254757
parent c95db6cea99563d0e164f5406461bec87e451bb0
Author: Yuukin256 <Yuukin256@gmail.com>
Date: Sat, 5 Nov 2022 00:49:00 +0900
devcontainer の設定を修正
Diffstat:
4 files changed, 7 insertions(+), 60 deletions(-)
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,14 +0,0 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-# && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# [Optional] Uncomment if you want to install an additional version of node using nvm
-# ARG EXTRA_NODE_VERSION=10
-# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
-
-# [Optional] Uncomment if you want to install more global node modules
-# RUN su node -c "npm install -g <your-package-list-here>"
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,28 +1,13 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/javascript-node-postgres
-// Update the VARIANT arg in docker-compose.yml to pick a Node.js version
{
- "name": "Node.js & PostgreSQL",
- "dockerComposeFile": "docker-compose.yml",
- "service": "app",
- "workspaceFolder": "/workspace",
-
- // Set *default* container specific settings.json values on container create.
- "settings": {},
-
- // Add the IDs of extensions you want installed when the container is created.
- "extensions": ["dbaeumer.vscode-eslint", "esbenp.prettier-vscode", "editorconfig.editorconfig"],
+ "name": "Node.js & TypeScript",
+ "image": "mcr.microsoft.com/devcontainers/typescript-node:18-bullseye",
// Use 'forwardPorts' to make a list of ports inside the container available locally.
- // This can be used to network with other containers or with the host.
- // "forwardPorts": [3000, 5432],
+ // "forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "yarn install",
- // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
- "remoteUser": "node",
- "features": {
- "git": "latest"
- }
+ // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+ "remoteUser": "node"
}
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -1,24 +0,0 @@
-version: '3.8'
-
-services:
- app:
- build:
- context: .
- dockerfile: Dockerfile
- args:
- # Update 'VARIANT' to pick an LTS version of Node.js: 18, 16, 14.
- # Append -bullseye or -buster to pin to an OS version.
- # Use -bullseye variants on local arm64/Apple Silicon.
- VARIANT: 16-bullseye
-
- volumes:
- - ..:/workspace:cached
-
- # Overrides default command so things don't shut down after the process ends.
- command: sleep infinity
-
- # Uncomment the next line to use a non-root user for all processes.
- # user: node
-
- # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
- # (Adding the "ports" property to this file will not forward from a Codespace.)
diff --git a/yarn.lock b/yarn.lock
@@ -6777,11 +6777,11 @@ __metadata:
"typescript@patch:typescript@^4.8.4#~builtin<compat/typescript>, typescript@patch:typescript@~4.8.3#~builtin<compat/typescript>":
version: 4.8.4
- resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=bda367"
+ resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=701156"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
- checksum: 563a0ef47abae6df27a9a3ab38f75fc681f633ccf1a3502b1108e252e187787893de689220f4544aaf95a371a4eb3141e4a337deb9895de5ac3c1ca76430e5f0
+ checksum: 301459fc3eb3b1a38fe91bf96d98eb55da88a9cb17b4ef80b4d105d620f4d547ba776cc27b44cc2ef58b66eda23fe0a74142feb5e79a6fb99f54fc018a696afa
languageName: node
linkType: hard
