From 714c444d8f82b11c928eb6596b12300fa9e6369e Mon Sep 17 00:00:00 2001
From: Fatih Alp <fatihalp89@gmail.com>
Date: Tue, 23 May 2023 19:37:56 +0000
Subject: [PATCH] Codespace Draft

---
 .devcontainer/devcontainer.json |  5 +++++
 .gitignore                      |  4 +++-
 docker-compose.yml              | 11 +++++------
 install.sh                      | 34 ++++++++++++++++-----------------
 4 files changed, 30 insertions(+), 24 deletions(-)
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..86a096ac0
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,5 @@
+{
+    "image": "mcr.microsoft.com/devcontainers/base:ubuntu",  // Any generic, debian-based image.
+    "features": {
+    }
+}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 399d09242..2ce671bee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,6 @@
 /vendor
 /coverage
 /node_modules
-/bower_components
\ No newline at end of file
+/bower_components
+composer.lock
+package-lock.json
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 5393d6fdc..83d4ede56 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,15 +2,16 @@ version: '3.8'
 
 networks:
   webapp:
+    driver: bridge
+  aliases:
+    - mysql.local
 
 services:
   nginx:
     image: nginx:stable-alpine
     container_name: ${APP_NAME}_nginx
     ports:
-      - "8000:80"
-    links:
-      - php
+      - "8000:80" 
     volumes:
       - ./:/var/www
   #    - ./docker/nginx/nginx.conf:/etc/nginx/nginx.conf:rw
@@ -32,9 +33,7 @@ services:
     ports:
       - "9001:9000"
     networks:
-      - webapp
-    links:
-        - database
+      - webapp 
     depends_on:
       database:
         condition: service_healthy
diff --git a/install.sh b/install.sh
index df2ddc48c..c669fecd0 100644
--- a/install.sh
+++ b/install.sh
@@ -19,20 +19,19 @@ if [[ $(which docker) && $(docker --version) ]]; then
   else
     #if ubuntu install docker
     if [  -n "$(uname -a | grep Ubuntu)" ]; then
-          sudo apt-get install -y \
-                apt-transport-https \
-                ca-certificates \
-                curl \
-                software-properties-common
-            curl -fsSL https://yum.dockerproject.org/gpg | sudo apt-key add -
-            sudo add-apt-repository \
-                "deb https://apt.dockerproject.org/repo/ \
-                ubuntu-$(lsb_release -cs) \
-                main"
-            sudo apt-get update
-            sudo apt-get -y install docker-engine
-            # add current user to docker group so there is no need to use sudo when running docker
-            sudo usermod -aG docker $(whoami)
+        sudo apt-get update
+        sudo apt-get install ca-certificates curl gnupg
+        sudo install -m 0755 -d /etc/apt/keyrings
+        curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+        sudo chmod a+r /etc/apt/keyrings/docker.gpg
+        echo \
+          "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+          "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
+        sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+        sudo apt-get update
+        sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+
+
     else
         echo "Install docker and come back later"
         exit
@@ -41,10 +40,11 @@ fi
 
 cp -u .env-sail .env
 
-docker compose build
-#--no-cache
+docker compose down -v
 
-docker compose up  -d
+docker compose build --no-cache
+
+docker compose up --force-recreate
 
 #
 #docker exec -it oc_php php artisan install --ready