From e85c1e39c9f1838df8f05aca006943d453f92aa1 Mon Sep 17 00:00:00 2001 From: Greg Sarjeant <1686767+gsarjeant@users.noreply.github.com> Date: Sun, 15 Jun 2025 15:18:03 -0400 Subject: [PATCH] Stop gitignoring sample docker compose files --- .gitignore | 2 +- docker-compose.yml | 1 + .../apache/shared-hosting/docker-compose.yml | 19 +++++++++++ examples/apache/vps/root/docker-compose.yml | 19 +++++++++++ .../apache/vps/subfolder/docker-compose.yml | 20 +++++++++++ examples/nginx/root/docker-compose.yml | 33 +++++++++++++++++++ examples/nginx/subfolder/docker-compose.yml | 33 +++++++++++++++++++ 7 files changed, 126 insertions(+), 1 deletion(-) create mode 120000 docker-compose.yml create mode 100644 examples/apache/shared-hosting/docker-compose.yml create mode 100644 examples/apache/vps/root/docker-compose.yml create mode 100644 examples/apache/vps/subfolder/docker-compose.yml create mode 100644 examples/nginx/root/docker-compose.yml create mode 100644 examples/nginx/subfolder/docker-compose.yml diff --git a/.gitignore b/.gitignore index ebb989d..3cb4b6d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ *.sqlite *.txt -docker-compose.yml +./docker-compose.yml init_complete storage/upload/css scratch \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 120000 index 0000000..632ec38 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1 @@ +examples/nginx/subfolder/docker-compose.yml \ No newline at end of file diff --git a/examples/apache/shared-hosting/docker-compose.yml b/examples/apache/shared-hosting/docker-compose.yml new file mode 100644 index 0000000..9bb3ef7 --- /dev/null +++ b/examples/apache/shared-hosting/docker-compose.yml @@ -0,0 +1,19 @@ +services: + php-apache: + image: php:8.2-apache + container_name: php-apache + ports: + - "80:80" + volumes: + - ./config:/var/www/html/tkr/config + - ./public:/var/www/html/tkr/public + - ./src:/var/www/html/tkr/src + - ./storage:/var/www/html/tkr/storage + - ./templates:/var/www/html/tkr/templates + - ./examples/apache/shared-hosting/.htaccess:/var/www/html/tkr/.htaccess + command: > + bash -c "a2enmod rewrite headers expires && + apache2-foreground && + chown -R www-data:www-data /var/www/html/tkr/storage" + + restart: unless-stopped diff --git a/examples/apache/vps/root/docker-compose.yml b/examples/apache/vps/root/docker-compose.yml new file mode 100644 index 0000000..2bcfff3 --- /dev/null +++ b/examples/apache/vps/root/docker-compose.yml @@ -0,0 +1,19 @@ +services: + php-apache: + image: php:8.2-apache + container_name: php-apache + ports: + - "80:80" + volumes: + - ./config:/var/www/tkr/config + - ./public:/var/www/tkr/public + - ./src:/var/www/tkr/src + - ./storage:/var/www/tkr/storage + - ./templates:/var/www/tkr/templates + - ./examples/apache/vps/root/tkr.my-domain.com.conf:/etc/apache2/sites-enabled/tkr.my-domain.com.conf + command: > + bash -c "a2enmod rewrite headers expires && + apache2-foreground && + chown -R www-data:www-data /var/www/tkr/storage" + + restart: unless-stopped diff --git a/examples/apache/vps/subfolder/docker-compose.yml b/examples/apache/vps/subfolder/docker-compose.yml new file mode 100644 index 0000000..2316f26 --- /dev/null +++ b/examples/apache/vps/subfolder/docker-compose.yml @@ -0,0 +1,20 @@ +services: + php-apache: + image: php:8.2-apache + container_name: php-apache + ports: + - "80:80" + volumes: + - ./config:/var/www/tkr/config + - ./public:/var/www/tkr/public + - ./src:/var/www/tkr/src + - ./storage:/var/www/tkr/storage + - ./templates:/var/www/tkr/templates + - ./examples/apache/vps/subfolder/my-domain.com.conf:/etc/apache2/sites-enabled/my-domain.com.conf + command: > + bash -c "a2enmod rewrite headers expires && + a2dissite 000-default && + apache2-foreground && + chown -R www-data:www-data /var/www/tkr/storage" + + restart: unless-stopped diff --git a/examples/nginx/root/docker-compose.yml b/examples/nginx/root/docker-compose.yml new file mode 100644 index 0000000..6d614f4 --- /dev/null +++ b/examples/nginx/root/docker-compose.yml @@ -0,0 +1,33 @@ +services: + nginx: + image: nginx:alpine + container_name: nginx-server + ports: + - "80:80" + volumes: + - ./public:/var/www/tkr/public + - ./examples/nginx/root/nginx.conf:/etc/nginx/conf.d/default.conf + depends_on: + - php + restart: unless-stopped + + php: + image: php:8.2-fpm-alpine + container_name: php-fpm + volumes: + - ./config:/var/www/tkr/config + - ./public:/var/www/tkr/public + - ./src:/var/www/tkr/src + - ./storage:/var/www/tkr/storage + - ./templates:/var/www/tkr/templates + command: > + sh -c " + chown -R www-data:www-data /var/www/tkr/storage && + chmod -R 775 /var/www/tkr/storage && + php-fpm + " + restart: unless-stopped + +volumes: + src: + driver: local \ No newline at end of file diff --git a/examples/nginx/subfolder/docker-compose.yml b/examples/nginx/subfolder/docker-compose.yml new file mode 100644 index 0000000..a5ed1c2 --- /dev/null +++ b/examples/nginx/subfolder/docker-compose.yml @@ -0,0 +1,33 @@ +services: + nginx: + image: nginx:alpine + container_name: nginx-server + ports: + - "80:80" + volumes: + - ./public:/var/www/tkr/public + - ./examples/nginx/subfolder/nginx.conf:/etc/nginx/conf.d/default.conf + depends_on: + - php + restart: unless-stopped + + php: + image: php:8.2-fpm-alpine + container_name: php-fpm + volumes: + - ./config:/var/www/tkr/config + - ./public:/var/www/tkr/public + - ./src:/var/www/tkr/src + - ./storage:/var/www/tkr/storage + - ./templates:/var/www/tkr/templates + command: > + sh -c " + chown -R www-data:www-data /var/www/tkr/storage && + chmod -R 775 /var/www/tkr/storage && + php-fpm + " + restart: unless-stopped + +volumes: + src: + driver: local \ No newline at end of file