Major website overhaul
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
version: '3'
|
||||
version: '3.1'
|
||||
services:
|
||||
|
||||
web:
|
||||
image: nginx:alpine
|
||||
nginx:
|
||||
image: nginx:latest
|
||||
container_name: nginx
|
||||
volumes:
|
||||
- "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf"
|
||||
- "./Website:/var/www/html/public:ro"
|
||||
- "./Website:/var/www/html/public"
|
||||
- "./etc/nginx/default.template.conf:/etc/nginx/conf.d/default.template"
|
||||
- "./etc/logs/nginx:/var/log/nginx"
|
||||
- "./etc/logs/letsencrypt:/var/log/letsencrypt"
|
||||
@@ -20,8 +20,8 @@ services:
|
||||
command: /bin/sh -c "envsubst '$$NGINX_HOST' < /etc/nginx/conf.d/default.template > /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
|
||||
restart: always
|
||||
depends_on:
|
||||
- php
|
||||
- mysqldb
|
||||
- tomcat
|
||||
# logging:
|
||||
# driver: splunk
|
||||
# options:
|
||||
@@ -31,22 +31,6 @@ services:
|
||||
# tag: "{{.ImageName}}/{{.Name}}/{{.ID}}"
|
||||
# labels: "Nginx"
|
||||
|
||||
php:
|
||||
image: nanoninja/php-fpm:7.2
|
||||
container_name: php
|
||||
restart: always
|
||||
volumes:
|
||||
- "./etc/php/php.ini:/usr/local/etc/php/conf.d/php.ini"
|
||||
- "./Website:/var/www/html/public"
|
||||
# logging:
|
||||
# driver: splunk
|
||||
# options:
|
||||
# splunk-token: "e1c56fa1-9f7c-4d2c-ba8f-989b15d85008"
|
||||
# splunk-url: "https://127.0.0.1:8088"
|
||||
# splunk-insecureskipverify: "true"
|
||||
# tag: "{{.ImageName}}/{{.Name}}/{{.ID}}"
|
||||
# labels: "PHP"
|
||||
|
||||
myadmin:
|
||||
image: phpmyadmin/phpmyadmin
|
||||
container_name: phpmyadmin
|
||||
@@ -77,7 +61,7 @@ services:
|
||||
- MYSQL_USER=dev
|
||||
- MYSQL_PASSWORD=dev
|
||||
ports:
|
||||
- "3306:3306"
|
||||
- "127.0.0.1:3306:3306"
|
||||
volumes:
|
||||
- "./data/db/mysql:/var/lib/mysql"
|
||||
- "./etc/mariadb/innodb-fix.cnf:/etc/mysql/conf.d/innodb-fix.cnf"
|
||||
@@ -95,7 +79,6 @@ services:
|
||||
container_name: tomcat
|
||||
ports:
|
||||
- "8082:8082"
|
||||
- "8443:8443"
|
||||
restart: always
|
||||
volumes:
|
||||
- "./Website:/usr/local/tomcat/webapps/ROOT"
|
||||
@@ -110,3 +93,25 @@ services:
|
||||
# splunk-insecureskipverify: "true"
|
||||
# tag: "{{.ImageName}}/{{.Name}}/{{.ID}}"
|
||||
# labels: "Tomcat"
|
||||
|
||||
ghost:
|
||||
image: ghost:latest
|
||||
container_name: ghost
|
||||
ports:
|
||||
- "127.0.0.1:2368:2368"
|
||||
restart: always
|
||||
volumes:
|
||||
- "./etc/ghost:/var/lib/ghost/content"
|
||||
depends_on:
|
||||
- nginx
|
||||
environment:
|
||||
NODE_ENV: production
|
||||
privacy__useUpdateCheck: 0
|
||||
# logging:
|
||||
# driver: splunk
|
||||
# options:
|
||||
# splunk-token: "e1c56fa1-9f7c-4d2c-ba8f-989b15d85008"
|
||||
# splunk-url: "https://127.0.0.1:8088"
|
||||
# splunk-insecureskipverify: "true"
|
||||
# tag: "{{.ImageName}}/{{.Name}}/{{.ID}}"
|
||||
# labels: "Ghost"
|
||||
|
||||
Reference in New Issue
Block a user