Merge pull request #6237 from benz0li/finalise-dev-containers-c7b679a

Finalise Dev Containers

Author: mpilgrem

.devcontainer/.gitignore

@@ -4,7 +4,7 @@
 !/assets/cradles/
 !/assets/cradles/cabal/
 !/assets/cradles/stack/
-!/assets/screenshots/
+!/backups/
 !/bind-mounts/
 !/conf/
 !/conf/etc/
@@ -17,7 +17,6 @@
 
 !/assets/cradles/cabal/hie.yaml
 !/assets/cradles/stack/hie.yaml
-!/assets/screenshots/manageHLS.png
 !/conf/etc/stack/config.yaml
 !/ghc-*/devcontainer.json
 !/scripts/usr/local/bin/*.sh

.devcontainer/GHC.Dockerfile

@@ -36,12 +36,12 @@ RUN sysArch="$(uname -m)" \
   ## Ensure that common CA certificates
   ## and OpenSSL libraries are up to date
   && apk upgrade --no-cache ca-certificates openssl-dev \
-  ## Install yamllint
-  && apk add --no-cache yamllint \
   ## Install pip
   && apk add --no-cache py3-pip \
   ## Install terminal multiplexers
   && apk add --no-cache screen tmux \
+  ## Install yamllint
+  && apk add --no-cache yamllint \
   ## Install hadolint
   && case "$sysArch" in \
     x86_64) tarArch="x86_64" ;; \
@@ -53,11 +53,7 @@ RUN sysArch="$(uname -m)" \
   && downloadUrl="$(echo "$apiResponse" | grep -e \
     "browser_download_url.*Linux-$tarArch\"" | cut -d : -f 2,3 | tr -d \")" \
   && echo "$downloadUrl" | xargs curl -sSLo /usr/local/bin/hadolint \
-  && chmod 755 /usr/local/bin/hadolint \
-  ## Create folders in root directory
-  && mkdir -p /root/.local/bin \
-  ## Create folders in skeleton directory
-  && mkdir -p /etc/skel/.local/bin
+  && chmod 755 /usr/local/bin/hadolint
 
 ## Update environment
 ARG USE_ZSH_FOR_ROOT

.devcontainer/README.md

@@ -1,9 +1,9 @@
 # Dev Containers
 
-See [haskellstack.org](https://docs.haskellstack.org): Stack's code (advanced)
-\> Maintainers \> Dev Containers or
-[../doc/maintainers/devcontainers.md](../doc/maintainers/devcontainers.md)
-for more information.
+For further information, see
+[haskellstack.org](https://docs.haskellstack.org): Stack's code (advanced) \>
+Contributors \> Dev Containers or
+[../doc/dev_containers.md](../doc/dev_containers.md).
 
 ## License
 

.devcontainer/backups/.keep

@@ -38,7 +38,7 @@ if ! grep -q "cabal's bin" "$HOME/.zshrc"; then
 fi
 
 # Enable Oh My Zsh plugins
-sed -i "s/plugins=(git)/plugins=(cabal git pip stack screen tmux vscode)/g" "$HOME/.zshrc"
+sed -i "s/plugins=(git)/plugins=(cabal git pip screen stack tmux vscode)/g" "$HOME/.zshrc"
 
 # Remove old .zcompdump files
 rm -f "$HOME"/.zcompdump*