From 88be7b573a03c25fc28c2281376b9414f7e66b82 Mon Sep 17 00:00:00 2001
From: Steven Richardson <steven@digitonic.co.uk>
Date: Thu, 5 Sep 2019 22:24:06 +0100
Subject: [PATCH] Updating for Laravel 6

---
 composer.json                               |  6 +++---
 stubs/Dockerfile                            | 16 +---------------
 stubs/docker-compose-cicd.yml               | 13 +++++++++----
 stubs/docker-compose.yml                    | 12 ++++++++----
 tools/docker/usr/local/share/env/20-arc-env |  6 ------
 5 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/composer.json b/composer.json
index 4a1fdec..1bac357 100644
--- a/composer.json
+++ b/composer.json
@@ -10,9 +10,9 @@
         }
     ],
     "require": {
-        "php": "^7.1.3",
-        "illuminate/support" : "~5.5",
-        "illuminate/console": "~5.5"
+        "php": "^7.2",
+        "illuminate/support" : "~6.0",
+        "illuminate/console": "~6.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/stubs/Dockerfile b/stubs/Dockerfile
index 6ea9b1e..015f3dd 100644
--- a/stubs/Dockerfile
+++ b/stubs/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/continuouspipe/php7.2-nginx:stable
+FROM digitonic1/php7.3-nginx:latest
 
 # Install node npm
 RUN curl -sL https://deb.nodesource.com/setup_11.x > /tmp/install-node.sh \
@@ -25,20 +25,6 @@ RUN curl -sL https://deb.nodesource.com/setup_11.x > /tmp/install-node.sh \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Install headless chrome for Dusk tests
-RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list' \
-&& apt-get update && apt-get install -y \
-    google-chrome-stable \
-    xvfb \
-    libnss3-dev \
-    libxi6 \
-    libgconf-2-4 \
-\
-# Clean the image \
- && apt-get auto-remove -qq -y \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
 
 COPY ./tools/docker/etc/ /etc/
 COPY ./tools/docker/usr/ /usr/
diff --git a/stubs/docker-compose-cicd.yml b/stubs/docker-compose-cicd.yml
index 60da569..61401dd 100644
--- a/stubs/docker-compose-cicd.yml
+++ b/stubs/docker-compose-cicd.yml
@@ -2,6 +2,7 @@ version: "3"
 
 services:
     web:
+        container_name: web
         build:
             context: .
             args:
@@ -17,7 +18,7 @@ services:
             - "80:80"
             - "443:443"
         volumes:
-            - .:/app
+            - .:/app:delegated
         environment:
           VIRTUAL_HOST: "127.0.0.1:80"
           REDIS_PORT: 6379
@@ -26,7 +27,8 @@ services:
           MAIL_PASSWORD: ""
 
     database:
-        image: quay.io/continuouspipe/mysql5.7:stable
+        container_name: database
+        image: digitonic1/mysql5.7:latest
         environment:
             MYSQL_ROOT_PASSWORD: arc
             MYSQL_DATABASE: arc
@@ -34,12 +36,15 @@ services:
             MYSQL_PASSWORD: arc
         expose:
             - 3306
+            - 4306
         ports:
-            - "3306:3306"
+            - "4306:3306"
 
     redis:
-        image: quay.io/continuouspipe/redis3:stable
+        container_name: redis
+        image: digitonic1/redis3:latest
         expose:
             - 6379
         ports:
             - "6379:6379"
+
diff --git a/stubs/docker-compose.yml b/stubs/docker-compose.yml
index d23856a..ec3c6bd 100644
--- a/stubs/docker-compose.yml
+++ b/stubs/docker-compose.yml
@@ -2,6 +2,7 @@ version: "3"
 
 services:
     web:
+        container_name: web
         build:
             context: .
             args:
@@ -16,7 +17,7 @@ services:
             - "80:80"
             - "443:443"
         volumes:
-            - .:/app
+            - .:/app:delegated
         environment:
           VIRTUAL_HOST: "127.0.0.1:80"
           REDIS_PORT: 6379
@@ -25,7 +26,8 @@ services:
           MAIL_PASSWORD: ""
 
     database:
-        image: quay.io/continuouspipe/mysql5.7:stable
+        container_name: database
+        image: digitonic1/mysql5.7:latest
         environment:
             MYSQL_ROOT_PASSWORD: arc
             MYSQL_DATABASE: arc
@@ -33,11 +35,13 @@ services:
             MYSQL_PASSWORD: arc
         expose:
             - 3306
+            - 4306
         ports:
-            - "3306:3306"
+            - "4306:3306"
 
     redis:
-        image: quay.io/continuouspipe/redis3:stable
+        container_name: redis
+        image: digitonic1/redis3:latest
         expose:
             - 6379
         ports:
diff --git a/tools/docker/usr/local/share/env/20-arc-env b/tools/docker/usr/local/share/env/20-arc-env
index a05dd74..a7d279f 100644
--- a/tools/docker/usr/local/share/env/20-arc-env
+++ b/tools/docker/usr/local/share/env/20-arc-env
@@ -89,12 +89,6 @@ export STRIPE_MODEL=${STRIPE_MODEL:-"App\User"}
 export STRIPE_KEY=${STRIPE_KEY:-null}
 export STRIPE_SECRET=${STRIPE_SECRET:-null}
 
-export BRAINTREE_MODEL=${BRAINTREE_MODEL:-"App\User"}
-export BRAINTREE_ENV=${BRAINTREE_ENV:-null}
-export BRAINTREE_MERCHANT_ID=${BRAINTREE_MERCHANT_ID:-null}
-export BRAINTREE_PUBLIC_KEY=${BRAINTREE_PUBLIC_KEY:-null}
-export BRAINTREE_PRIVATE_KEY=${BRAINTREE_PRIVATE_KEY:-null}
-
 export BROADCAST_DRIVER=${BROADCAST_DRIVER:-pusher}
 export PUSHER_APP_ID=${PUSHER_APP_ID:-null}
 export PUSHER_KEY=${PUSHER_KEY:-null}