Chore: Add devcontainer env

Author: johanmartindev

.github/.devcontainer/devcontainer.json

@@ -131,6 +131,7 @@
   },
   "postCreateCommand": "bash .devcontainer/scripts/post-create.sh",
   "onCreateCommand": "bash .devcontainer/scripts/setup-dotnet-dev-cert.sh",
+  "postAttachCommand": "bash -i .devcontainer/scripts/post-attach.sh",
   "remoteUser": "vscode",
   "features": {
     "ghcr.io/devcontainers/features/common-utils:2": {

.gitignore

@@ -104,4 +104,5 @@ wp-config.php
 
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
 .env
+devcontainer.env
 .vscode/

docker-compose.yml

@@ -1,16 +1,15 @@
 services:
   app:
+    env_file: devcontainer.env
     platform: linux/arm64
-    image: ghcr.io/nziswano/wordpress-dev:latest
+    image: ghcr.io/nziswano/wp-devcontainer:latest
     volumes:
       - ..:/workspace:cached
       - vscode-extension-wp:/vscode/.vscode-server/extensions
     command: sleep infinity
     network_mode: service:wordpressdb
     depends_on:
       - wordpressdb
-    env_file:
-      - .env
     environment:
       - WORDPRESS_DB_HOST=${WORDPRESS_DB_HOST}
       - WORDPRESS_DB_USER=${WORDPRESS_DB_USER}
@@ -34,18 +33,11 @@ services:
     volumes:
       - ./scripts/test-db.sql:/docker-entrypoint-initdb.d/test-db.sql
       - mariadb-data:/var/lib/mysql
-    environment:
-      MARIADB_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MARIADB_USER: ${MYSQL_USER}
-      MARIADB_PASSWORD: ${MYSQL_PASSWORD}
-      MARIADB_DATABASE: ${MYSQL_DATABASE}
   adminer:
     platform: linux/arm64
     image: adminer
     ports:
       - 9090:9090
-    env_file:
-      - .env
   civicrm:
     hostname: example
     image: civicrm/civicrm:latest

scripts/post-attach.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -xe
+if git config --global gpg.ssh.program; then
+  echo "Unsetting gpg.ssh.program"
+  git config --global --unset gpg.ssh.program
+  git config --global --add safe.directory /workspace
+fi

scripts/post-create.sh

@@ -1,15 +1,4 @@
 #!/usr/bin/env zsh
 set -xe
-nvm install --lts
+. ${NVM_DIR}/nvm.sh && nvm install --lts --latest-npm --default --save
 npm install -g typescript prettier prettier aws-cdk
-npm cache clean
-git config --global pull.rebase true
-git config --global --add safe.directory /workspace
-git config --global user.name "Johan Martin"
-git config --global user.email "jnm+johanmartindev@catenare.com"
-git config --global gpg.format ssh && git config --global user.signingkey "$SSH_SIGNING_KEY"
-git config --global commit.gpgsign true
-if git config --global gpg.ssh.program; then
-  echo "Unsetting gpg.ssh.program"
-  git config --global --unset gpg.ssh.program
-fi

scripts/setup-dotnet-dev-cert.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-
+set -xe
 # Change ownership of the .dotnet directory to the vscode user (to avoid permission errors)
 sudo chown -R vscode:vscode /home/vscode/.dotnet
 
@@ -10,4 +10,4 @@ dotnet dev-certs https
 sudo -E dotnet dev-certs https --export-path /usr/local/share/ca-certificates/dotnet-dev-cert.crt --format pem
 
 # Add the PEM file to the trust store
-sudo update-ca-certificates
+sudo update-ca-certificates