diff --git a/phpfpm-k8s/app-code/docker-compose.yml b/phpfpm-k8s/app-code/docker-compose.yml index b06440bd..351dd426 100644 --- a/phpfpm-k8s/app-code/docker-compose.yml +++ b/phpfpm-k8s/app-code/docker-compose.yml @@ -10,16 +10,16 @@ services: networks: - app-tier nginx: - image: 'bitnami/nginx:1.12.0-r2' + image: 'bitnami/nginx:1.19-debian-10' depends_on: - phpfpm networks: - app-tier ports: - - '80:80' - - '443:443' + - '80:8080' + - '443:8443' volumes: - - ./vhosts:/bitnami/nginx/conf/server_blocks + - ./server_blocks:/opt/bitnami/nginx/conf/server_blocks mariadb: image: bitnami/mariadb:latest environment: diff --git a/phpfpm-k8s/app-code/vhosts/nginx.conf b/phpfpm-k8s/app-code/server_blocks/nginx.conf similarity index 80% rename from phpfpm-k8s/app-code/vhosts/nginx.conf rename to phpfpm-k8s/app-code/server_blocks/nginx.conf index 71068ccc..90c7e869 100644 --- a/phpfpm-k8s/app-code/vhosts/nginx.conf +++ b/phpfpm-k8s/app-code/server_blocks/nginx.conf @@ -1,11 +1,11 @@ server { - listen 0.0.0.0:80; + listen 0.0.0.0:8080; server_name myapp.com; root /app; location / { - index index.php; + index index.html index.php; } location ~ \.php$ { diff --git a/phpfpm-k8s/helm-chart/templates/deployment.yaml b/phpfpm-k8s/helm-chart/templates/deployment.yaml index 6297ce8e..ca3ec126 100644 --- a/phpfpm-k8s/helm-chart/templates/deployment.yaml +++ b/phpfpm-k8s/helm-chart/templates/deployment.yaml @@ -67,7 +67,7 @@ spec: timeoutSeconds: 1 volumeMounts: - name: nginx-config - mountPath: /bitnami/nginx/conf/server_blocks + mountPath: /opt/bitnami/nginx/conf/server_blocks volumes: - name: nginx-config configMap: