Merge pull request #25 from tulik/remove-varnish

Remove Varnish

Author: Lukasz D. Tulikowski

.travis.yml

@@ -40,10 +40,8 @@ script:
   - curl -k https://localhost
   - docker build -t gcr.io/$GCLOUD_PROJECT/php -t gcr.io/$GCLOUD_PROJECT/php:latest symfony
   - docker build -t gcr.io/$GCLOUD_PROJECT/nginx -t gcr.io/$GCLOUD_PROJECT/nginx:latest -f symfony/Dockerfile.nginx symfony
-  - docker build -t gcr.io/$GCLOUD_PROJECT/varnish -t gcr.io/$GCLOUD_PROJECT/varnish:latest -f symfony/Dockerfile.varnish symfony
   - gcloud container clusters get-credentials cluster-1 --zone europe-west1-c --project $GCLOUD_PROJECT
   - gcloud docker -- push gcr.io/$GCLOUD_PROJECT/php
   - gcloud docker -- push gcr.io/$GCLOUD_PROJECT/nginx
-  - gcloud docker -- push gcr.io/$GCLOUD_PROJECT/varnish
   - linux-amd64/helm del --purge symfony-4-docker-runtime-env
   - linux-amd64/helm install helm/symfony --namespace symfony --name symfony-4-docker-runtime-env

docker-compose.yaml

@@ -32,19 +32,6 @@ services:
         volumes:
         - ./symfony/public:/srv/symfony/public:ro
 
-    cache-proxy:
-        build:
-            context: ./symfony/
-            dockerfile: ./Dockerfile.varnish
-        container_name: cache-proxy
-        depends_on:
-        - symfony
-        # Comment out this volume in production
-        volumes:
-        - ./symfony/docker/varnish/conf:/etc/varnish:ro
-        ports:
-        - "8081:80"
-
     postgres:
         # In production, you may want to use a managed database service
         image: postgres:9.6-alpine
@@ -105,11 +92,9 @@ services:
         container_name: h2-proxy
         depends_on:
         - symfony
-        - cache-proxy
         ports:
         - "80:80"
         - "443:443"
-        - "8443:8443"
 
 volumes:
     db-data: {}

h2-proxy/conf.d/default.conf

@@ -19,20 +19,3 @@ server {
         proxy_set_header X-Forwarded-Port 443;
     }
 }
-
-server {
-    listen 8443 ssl http2;
-    listen [::]:8443 ssl http2;
-
-    ssl_certificate /etc/nginx/ssl/cert.crt;
-    ssl_certificate_key /etc/nginx/ssl/cert.key;
-
-    location / {
-        proxy_pass http://cache-proxy;
-        proxy_http_version 1.1;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Host $host;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Port 8444;
-    }
-}