drupal version update and assignment fix

swarm-app-2/docker-compose.yml

@@ -1,13 +1,14 @@
+# If taking Docker Mastery, this is the same file you created in 
+# ./compose-assignment-2
+# If taking Swarm Mastery, this is your starting point for adding secrets :)
+# reminder, this needs to change to 3.1 version to use secrets!
 version: '2'
 
 services:
 
   drupal:
     image: custom-drupal
-    build: 
-      # NOTE: these 2 line is only for bret
-      context: .
-      dockerfile: answer.Dockerfile
+    build: .
     ports:
       - "8080:80"
     volumes:

swarm-stack-3/Dockerfile

@@ -1,12 +1,17 @@
-FROM drupal:8.2
+FROM drupal:8.5
 
 
 RUN apt-get update && apt-get install -y git \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /var/www/html/themes
+# this next part was corrected in 2018 to be more clear on how you'd typically 
+# customize your own theme. first you need to clone the theme into this repo
+# with something like downloading the lastest theme for bootstrap
+# https://www.drupal.org/project/bootstrap and extract into themes dir on host.
+# then you'll COPY it into image here:
 
-RUN git clone --branch 8.x-3.x --single-branch --depth 1 https://git.drupal.org/project/bootstrap.git \
-    && chown -R www-data:www-data bootstrap
+WORKDIR /var/www/html/core
+
+COPY ./themes ./themes
 
 WORKDIR /var/www/html

swarm-stack-3/docker-compose.test.yml

@@ -3,7 +3,7 @@ version: '3.1'
 services:
 
   drupal:
-    image: bretfisher/custom-drupal
+    image: custom-drupal
     build: .
     ports:
       - "80:80"

swarm-stack-3/docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.1'
 services:
 
   drupal:
-    image: bretfisher/custom-drupal:latest
+    image: custom-drupal:latest
 
   postgres:
     image: postgres:9.6