From 5a7e3711c33c9d69bf1bae01417eee9312fb461a Mon Sep 17 00:00:00 2001 From: Ky Duyen Date: Wed, 5 Jun 2024 16:48:00 -0500 Subject: [PATCH] Reapply "Reapply "set up"" This reverts commit 162675ae732fdd270bc557734abde3c78c0df6eb. --- .devcontainer/Dockerfile | 14 +++++++------- .devcontainer/docker-compose.yml | 2 +- .devcontainer/import-database.sh | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 .devcontainer/import-database.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 93e1552a..150a5aa5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,13 +6,13 @@ FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} # Install MongoDB command line tools if on buster and x86_64 (arm64 not supported) ARG MONGO_TOOLS_VERSION=5.0 RUN . /etc/os-release \ - && if [ "${VERSION_CODENAME}" = "buster" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ - curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ - && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ - && apt-get update && export DEBIAN_FRONTEND=noninteractive \ - && apt-get install -y mongodb-database-tools mongodb-mongosh \ - && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ - fi + && if [ "${VERSION_CODENAME}" = "bullseye" ] && [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl -sSL "https://www.mongodb.org/static/pgp/server-${MONGO_TOOLS_VERSION}.asc" | gpg --dearmor > /usr/share/keyrings/mongodb-archive-keyring.gpg \ + && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/mongodb-archive-keyring.gpg] http://repo.mongodb.org/apt/debian $(lsb_release -cs)/mongodb-org/${MONGO_TOOLS_VERSION} main" | tee /etc/apt/sources.list.d/mongodb-org-${MONGO_TOOLS_VERSION}.list \ + && apt-get update && export DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y mongodb-database-tools mongodb-mongosh \ + && apt-get clean -y && rm -rf /var/lib/apt/lists/*; \ + fi # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index e0292731..982e09b9 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: # 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: 18-buster + VARIANT: 18-bullseye volumes: - ..:/workspace:cached diff --git a/.devcontainer/import-database.sh b/.devcontainer/import-database.sh old mode 100644 new mode 100755