Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

Commit 8e8a768

Browse files
committed
Merge branch 'feature/mjolner' into develop
2 parents b05f1d6 + eb0b212 commit 8e8a768

3 files changed

+47
-90
lines changed

docker-compose.prod.yml

-36
This file was deleted.

docker-compose.server.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# itk-version: 2.0.1
2+
version: "3"
3+
4+
networks:
5+
frontend:
6+
external: true
7+
app:
8+
driver: bridge
9+
internal: false
10+
11+
services:
12+
phpfpm:
13+
image: itkdev/php7.4-fpm:alpine
14+
restart: unless-stopped
15+
networks:
16+
- app
17+
extra_hosts:
18+
- "host.docker.internal:host-gateway"
19+
environment:
20+
- PHP_MAX_EXECUTION_TIME=30
21+
- PHP_MEMORY_LIMIT=128M
22+
- COMPOSER_VERSION=2
23+
volumes:
24+
- .:/app:delegated
25+
26+
nginx:
27+
image: nginxinc/nginx-unprivileged:alpine
28+
restart: unless-stopped
29+
networks:
30+
- app
31+
- frontend
32+
depends_on:
33+
- phpfpm
34+
ports:
35+
- '8080'
36+
volumes:
37+
- ${PWD}/.docker/vhost.conf:/etc/nginx/conf.d/default.conf:ro
38+
- ./:/app:rw
39+
labels:
40+
- "traefik.enable=true"
41+
- "traefik.docker.network=frontend"
42+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-http.rule=Host(`${COMPOSE_SERVER_DOMAIN}`)"
43+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-http.entrypoints=web"
44+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-http.middlewares=redirect-to-https"
45+
- "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
46+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_SERVER_DOMAIN}`)"
47+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.entrypoints=websecure"

docker-compose.test.yml

-54
This file was deleted.

0 commit comments

Comments
 (0)