From d59b67370973824274b9049dcb3743a012e66403 Mon Sep 17 00:00:00 2001
From: Evan Pratten <ewpratten@gmail.com>
Date: Sat, 29 Aug 2020 16:47:08 -0400
Subject: [PATCH] Update extensions list

---
 .devcontainer/Dockerfile        | 34 ---------------------------------
 .devcontainer/devcontainer.json | 10 +++-------
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 .devcontainer/Dockerfile

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index 902b06ded..000000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu
-
-RUN adduser --shell /bin/bash --disabled-password --home /home/user5k user5k
-RUN passwd -d user5k
-RUN apt update -y
-RUN apt install sudo -y
-RUN usermod -aG sudo user5k
-
-# Set the user
-# USER user5k
-
-# Update apt
-RUN sudo apt update -y 
-
-# Install needed packages
-RUN sudo apt install -y python3 python3-pip
-RUN sudo apt install -y curl wget
-RUN sudo apt install -y zip unzip
-
-# Install sdkman
-RUN curl -s "https://get.sdkman.io?rcupdate=true" | bash
-
-# Install java
-RUN bash -c "source /root/.sdkman/bin/sdkman-init.sh && sdk install java 11.0.8-open"
-
-# Install gradle
-RUN bash -c "source /root/.sdkman/bin/sdkman-init.sh && sdk install gradle"
-
-RUN echo "source /root/.sdkman/bin/sdkman-init.sh" >> /root/.bashrc
-
-# Install WPILib
-RUN wget https://github.com/wpilibsuite/allwpilib/releases/download/v2020.3.2/WPILib_Linux-2020.3.2.tar.gz -O wpilib.tar.gz
-RUN mkdir -p /root/wpilib/2020
-RUN tar -zxvf wpilib.tar.gz -C /root/wpilib/2020
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 8013474bd..b5c137a3a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,10 +1,5 @@
 {
-    "name":"Codespaces",
-    // "build":{
-    //     "dockerfile": "Dockerfile",
-    //     "args": {
-    //     }
-    // },
+    "name":"General Java Development",
     "image":"ewpratten/frc_devcontainer:2020.3.2",
     "settings": {
         "terminal.integrated.shell.linux":"/bin/bash"
@@ -25,6 +20,7 @@
         "wpilibsuite.vscode-wpilib",
         "redhat.java",
         "ms-vscode.cpptools",
-        "ms-python.python"
+        "ms-python.python",
+        "vscjava.vscode-java-pack"
     ]
 }
\ No newline at end of file