From 6ee5788fe102daa04dd1978e7079cc7d1286c297 Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Fri, 22 Apr 2022 23:21:02 -0400 Subject: [PATCH] chore: fix devcontainer + add missing extensions --- .devcontainer/Dockerfile | 1 - .devcontainer/devcontainer.json | 2 ++ .devcontainer/docker-compose.yml | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 38eea01a..e9eff309 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -31,7 +31,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install - jq \ less \ git \ - gnupg \ gnupg2 \ nano \ pandoc \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 277f8387..52dd9025 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -29,6 +29,7 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [ + "arcanis.vscode-zipfs", "dbaeumer.vscode-eslint", "eamodio.gitlens", "johnsoncodehk.volar", @@ -36,6 +37,7 @@ "redhat.vscode-yaml", "visualstudioexptteam.vscodeintellicode", "editorconfig.editorconfig", + "lokalise.i18n-ally", "mrmlnc.vscode-duplicate", "mtxr.sqltools-driver-pg", "mutantdino.resourcemonitor", diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e507e722..997aae9c 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -12,7 +12,7 @@ services: VARIANT: 16-bullseye volumes: - - ..:/workspace:cached + - ..:/workspace - wiki-vscode-ext:/root/.vscode-server/extensions # Overrides default command so things don't shut down after the process ends. @@ -46,8 +46,8 @@ services: - PGADMIN_LISTEN_PORT=8000 - PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False network_mode: service:db - volumes: - - ./pgadmin-servers.json:/pgadmin4/servers.json + # volumes: + # - ./pgadmin-servers.json:/pgadmin4/servers.json volumes: postgres-data: