From 4792acc59abdc8f43eae258c11e19046c359290e Mon Sep 17 00:00:00 2001
From: "Buster \"Silver Eagle\" Neece" <buster@busterneece.com>
Date: Fri, 24 Sep 2021 02:10:24 -0500
Subject: [PATCH] Update VSCode dev env to match Gitpod.

---
 .devcontainer/Dockerfile                  |  5 +++--
 .devcontainer/devcontainer.json           |  9 ++++----
 .devcontainer/devsetup.sh                 |  9 ++++----
 .devcontainer/docker-compose.override.yml | 25 -----------------------
 4 files changed, 13 insertions(+), 35 deletions(-)
 delete mode 100644 .devcontainer/docker-compose.override.yml

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index fd499fd79..96704d0cf 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -4,7 +4,7 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu-20.04
 # [Option] Install zsh
 ARG INSTALL_ZSH="true"
 # [Option] Upgrade OS packages to their latest versions
-ARG UPGRADE_PACKAGES="false"
+ARG UPGRADE_PACKAGES="true"
 # [Option] Enable non-root Docker access in container
 ARG ENABLE_NONROOT_DOCKER="true"
 # [Option] Use the OSS Moby CLI instead of the licensed Docker CLI
@@ -31,4 +31,5 @@ CMD [ "sleep", "infinity" ]
 
 # [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>
\ No newline at end of file
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f5a729c15..c27d1b00c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -16,13 +16,14 @@
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
-		"ms-azuretools.vscode-docker"
+		"ms-azuretools.vscode-docker",
+		"bmewburn.vscode-intelephense-client",
+		"editorconfig.editorconfig"
 	],
 	
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [
-		80,
-		443
+		10080
 	],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
@@ -30,4 +31,4 @@
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"
-}
\ No newline at end of file
+}
diff --git a/.devcontainer/devsetup.sh b/.devcontainer/devsetup.sh
index 9059888af..5d21d9854 100644
--- a/.devcontainer/devsetup.sh
+++ b/.devcontainer/devsetup.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-cp sample.env .env
+cp dev.env .env
 cp azuracast.dev.env azuracast.env
-cp docker-compose.sample.yml docker-compose.yml
-cp .devcontainer/docker-compose.override.yml docker-compose.override.yml
+
+cp docker-compose.cloudide.yml docker-compose.yml
+
 docker-compose build web
 docker-compose run --rm --user=azuracast web azuracast_install
-docker-compose up -d
\ No newline at end of file
+docker-compose up -d
diff --git a/.devcontainer/docker-compose.override.yml b/.devcontainer/docker-compose.override.yml
deleted file mode 100644
index 423380971..000000000
--- a/.devcontainer/docker-compose.override.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-services:
-  nginx_proxy:
-    volumes:
-      - ./util/local_ssl:/etc/nginx/certs
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-
-  web:
-    build:
-      context: .
-    volumes:
-      - ./util/local_ssl:/etc/nginx/certs:ro
-      - ${LOCAL_WORKSPACE_FOLDER}/vendor:/var/azuracast/www/vendor
-      - ${LOCAL_WORKSPACE_FOLDER}:/var/azuracast/www
-
-  mariadb:
-    ports:
-      - "127.0.0.1:3306:3306"
-
-  redis:
-    ports:
-      - "127.0.0.1:6379:6379"
-
-  stations:
-    volumes:
-      - ./util/local_ssl:/etc/nginx/certs