From aec480d1106b3ad312334c6df3c842388586acb3 Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal.catic@hotmail.com>
Date: Wed, 24 Oct 2018 12:09:35 +0200
Subject: [PATCH 1/2] fix env and docker build

---
 .dockerignore       |  4 ++++
 backend.dockerfile  |  2 +-
 docker/php/setup.sh | 11 -----------
 3 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..0d03b88
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+./database/volume
+./docker/backend/uploads
+./log/backend
+./log/frontend
\ No newline at end of file
diff --git a/backend.dockerfile b/backend.dockerfile
index 7bd6acf..6c79531 100644
--- a/backend.dockerfile
+++ b/backend.dockerfile
@@ -58,7 +58,7 @@ COPY docker/php/setup.sh /init-scripts/
 RUN chmod +x /init-scripts/setup.sh
 
 RUN docker-php-ext-install pdo pdo_mysql mysqli
-RUN a2enmod rewrite ssl
+RUN a2enmod rewrite
 COPY docker/php/000-default.conf /etc/apache2/sites-available
 
 COPY backend /home/wiaas/backend
diff --git a/docker/php/setup.sh b/docker/php/setup.sh
index 6b2bdbd..27ea774 100644
--- a/docker/php/setup.sh
+++ b/docker/php/setup.sh
@@ -11,21 +11,10 @@ echo "Ready...."
 sudo -u www-data -s -- <<EOF
     # Export variables for www-data user so they
     # are accessible when running wp CLI
-    export WP_ENV="$WP_ENV"
-    export WP_HOME="$WP_HOME"
     export WP_DB_HOST="$WP_DB_HOST"
     export MYSQL_DATABASE="$MYSQL_DATABASE"
     export MYSQL_USER="$MYSQL_USER"
     export MYSQL_PASSWORD="$MYSQL_PASSWORD"
-    export WP_AUTH_KEY="$WP_AUTH_KEY"
-    export WP_SECURE_AUTH_KEY="$WP_SECURE_AUTH_KEY"
-    export WP_LOGGED_IN_KEY="$WP_LOGGED_IN_KEY"
-    export WP_NONCE_KEY="$WP_NONCE_KEY"
-    export WP_AUTH_SALT="$WP_AUTH_SALT"
-    export WP_SECURE_AUTH_SALT="$WP_SECURE_AUTH_SALT"
-    export WP_LOGGED_IN_SALT="$WP_LOGGED_IN_SALT"
-    export WP_NONCE_SALT="$WP_NONCE_SALT"
-    export WP_JWT_AUTH_SECRET_KEY="$WP_JWT_AUTH_SECRET_KEY"
 
     # Execute database update
     composer update-db

From d1a6d1a4d8615414c371924f41143b59f2e0a5bb Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal@saburly.com>
Date: Wed, 24 Oct 2018 12:14:23 +0000
Subject: [PATCH 2/2] Update .dockerignore

---
 .dockerignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.dockerignore b/.dockerignore
index 0d03b88..b7c75df 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,5 @@
+# Added to prevent permission problems when building without using super user privileges
+
 ./database/volume
 ./docker/backend/uploads
 ./log/backend