Removed cache-rebuild by default from Dockerfile

codingdavinci · Sep 25, 2019 · 642a04c · 642a04c
1 parent 921d1cb
commit 642a04c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -71,16 +71,16 @@ RUN { \
 		echo "</VirtualHost>"; \
 	} > /etc/apache2/sites-enabled/000-default.conf
 
-# Clear Drupal cache
-RUN php vendor/drush/drush/drush cache-rebuild	
-
 # install Certbot, see https://certbot.eff.org/lets-encrypt/debianbuster-apache
 RUN apt-get -y install certbot python-certbot-apache
 # RUN certbot --apache
 
 # Clean system
 RUN rm -rf /var/lib/apt/lists/*
 
+# Clear Drupal cache
+# ENTRYPOINT ["php", "vendor/drush/drush/drush", "cache-rebuild"]
+
 HEALTHCHECK --interval=1m --timeout=3s CMD curl --fail http://localhost/ || exit 1
 
 EXPOSE 8080
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ Yarn scripts are set up to lint ES6 JavaScript files and SCSS files:
 
 This Dupal project is available as Docker container from Docker Hub: https://hub.docker.com/r/codingdavinci/relaunch2018
 
-To execute the pre-compiled Docker container run the following command with the variables set for your environment. An example (!) for Docker Composer can be found in [docker-composer.yml](docker-composer.yml).
+To execute the pre-compiled Docker container run the following command with the variables set for your environment. An example for Docker Composer can be found in [docker-compose.yml](docker-compose.yml).
 ```shell
 docker run -d -p 8080:80 -P \
   --env "MYSQL_HOSTNAME=cdv.example.com" \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   cdv:
-    image: codingsdavinci/relaunch2018:lastest
+    image: codingsdavinci/relaunch2018:latest
     environment:
       MYSQL_HOSTNAME: "cdv.example.com"
       MYSQL_DATABASE: "mycdvdatabase"
@@ -11,9 +11,10 @@ services:
       HASH_SALT: "myverysecretcdvhashsalt"
       UPDATE_FREE_ACCESS: "FALSE"
       FILE_PUBLIC_PATH: "sites/default/files"
-      TRUSTED_HOST_PATTERNS: "^localhost$, ^127.0.0.1$"
+      TRUSTED_HOST_PATTERNS: "^localhost$$, ^127.0.0.1$$, ^test.codingdavinci.de$$"
     volumes:
       - cdv:/var/www/html/web/sites/default/files
     ports:
-      - "80"
+      - "80:80"
+      - "443:443"
     restart: always