Skip to content
This repository was archived by the owner on Mar 24, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions phpfpm-k8s/app-code/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
@@ -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$ {
Expand Down
2 changes: 1 addition & 1 deletion phpfpm-k8s/helm-chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down