Skip to content

Commit e5c602c

Browse files
committed
Updated docker compose setup
1 parent 3a26e25 commit e5c602c

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
COMPOSE_PROJECT_NAME=ai-screening
22
COMPOSE_DOMAIN=ai-screening.local.itkdev.dk
3+
ITKDEV_TEMPLATE=drupal-11

docker-compose.server.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ networks:
88

99
services:
1010
phpfpm:
11-
image: itkdev/php8.3-fpm:alpine
11+
image: itkdev/php8.4-fpm:alpine
1212
restart: unless-stopped
1313
networks:
1414
- app
@@ -17,6 +17,7 @@ services:
1717
environment:
1818
- PHP_MAX_EXECUTION_TIME=30
1919
- PHP_MEMORY_LIMIT=128M
20+
# Let drush know the site uri (makes using --uri redundant)
2021
- DRUSH_OPTIONS_URI=https://${COMPOSE_SERVER_DOMAIN}
2122
depends_on:
2223
- memcached

docker-compose.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,9 @@ services:
2525
- MYSQL_PASSWORD=db
2626
- MYSQL_DATABASE=db
2727
#- ENCRYPT=1 # Uncomment to enable database encryption.
28-
# https://symfony.com/doc/current/setup/symfony_server.html#docker-integration
29-
labels:
30-
com.symfony.server.service-prefix: 'DATABASE'
3128

3229
phpfpm:
33-
image: itkdev/php8.3-fpm:latest
30+
image: itkdev/php8.4-fpm:latest
3431
user: ${COMPOSE_USER:-deploy}
3532
networks:
3633
- app
@@ -44,6 +41,7 @@ services:
4441
- PHP_SENDMAIL_PATH=/usr/bin/msmtp --host=mail --port=1025 --read-recipients --read-envelope-from
4542
- DOCKER_HOST_DOMAIN=${COMPOSE_DOMAIN}
4643
- PHP_IDE_CONFIG=serverName=localhost
44+
# Let drush know the site uri (makes using --uri redundant)
4745
- DRUSH_OPTIONS_URI=http://${COMPOSE_DOMAIN}
4846
depends_on:
4947
mariadb:
@@ -74,9 +72,9 @@ services:
7472
- "traefik.enable=true"
7573
- "traefik.docker.network=frontend"
7674
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.rule=Host(`${COMPOSE_DOMAIN}`)"
77-
# HTTPS config - uncomment to enable redirect from :80 to :443
78-
# - "traefik.http.routers.${COMPOSE_PROJECT_NAME}.middlewares=redirect-to-https"
79-
# - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
75+
# HTTPS config - enable redirect from :80 to :443
76+
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}.middlewares=redirect-to-https"
77+
- "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https"
8078

8179
memcached:
8280
image: memcached:alpine

0 commit comments

Comments
 (0)