From fdf36c0af83db4fa015794e9827ccce0aa8b5a5e Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <kjhoerr@protonmail.com>
Date: Thu, 29 Dec 2022 18:03:41 -0500
Subject: Update; Switch to MongoDB

---
 .devcontainer/Dockerfile        | 33 ---------------------------------
 .devcontainer/devcontainer.json | 24 ++++++++++--------------
 2 files changed, 10 insertions(+), 47 deletions(-)
 delete mode 100644 .devcontainer/Dockerfile

(limited to '.devcontainer')

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index a1aa4f0..0000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/java/.devcontainer/base.Dockerfile
-
-# [Choice] Java version (use -bullseye variants on local arm64/Apple Silicon): 11, 17, 11-bullseye, 17-bullseye, 11-buster, 17-buster
-ARG VARIANT="17-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/java:0-${VARIANT}
-
-# [Option] Install Maven
-ARG INSTALL_MAVEN="false"
-ARG MAVEN_VERSION=""
-# [Option] Install Gradle
-ARG INSTALL_GRADLE="false"
-ARG GRADLE_VERSION=""
-RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install maven \"${MAVEN_VERSION}\""; fi \
-    && if [ "${INSTALL_GRADLE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle \"${GRADLE_VERSION}\""; fi
-
-# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="none"
-RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# Liquibase CLI
-ARG LIQUIBASE_VERSION="4.14.0"
-RUN mkdir -p /opt/liquibase && cd /opt/liquibase \
- && curl -GL https://github.com/liquibase/liquibase/releases/download/v${LIQUIBASE_VERSION}/liquibase-${LIQUIBASE_VERSION}.tar.gz -o ./liquibase.tar.gz \
- && tar xvf ./liquibase.tar.gz \
- && rm liquibase.tar.gz
-ENV PATH $PATH:/opt/liquibase
-
-# [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 this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e4580f7..36e9c21 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,15 +1,14 @@
-// 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.241.1/containers/java
 {
 	"name": "Pantry",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			"VARIANT": "17-bullseye",
-			"INSTALL_MAVEN": "true",
-			"INSTALL_GRADLE": "false",
-			"NODE_VERSION": "lts/*",
-			"LIQUIBASE_VERSION": "4.14.0"
+	"image": "mcr.microsoft.com/devcontainers/java:17-bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/java:1": {
+		   "version": "none",
+		   "installMaven": "true"
+	   	},
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {},
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "latest"
 		}
 	},
 
@@ -37,8 +36,5 @@
 	// "postCreateCommand": "mvn compile",
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode",
-	"features": {
-		"docker-from-docker": "latest"
-	}
+	"remoteUser": "vscode"
 }
-- 
cgit