Skip to content

Commit ab8356b

Browse files
authored
Merge pull request #608 from City-of-Helsinki/UHF-12168
UHF-12168: Updated php 8.4, removed DRUPAL_IMAGE env variable
2 parents 55c2b5e + 6335199 commit ab8356b

2 files changed

Lines changed: 2 additions & 5 deletions

File tree

.env

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,5 @@ STAGE_FILE_PROXY_ORIGIN_DIR=tyoyrittaminen5ce88prod
1919

2020
COMPOSE_PROFILES=
2121

22-
# Docker image
23-
DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3
24-
2522
# Public webroot
2623
DRUPAL_WEBROOT=public

compose.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
app:
33
container_name: "${COMPOSE_PROJECT_NAME}-app"
4-
image: "${DRUPAL_IMAGE}"
4+
image: "${DRUPAL_IMAGE:-ghcr.io/city-of-helsinki/drupal-web:8.4}"
55
hostname: "${COMPOSE_PROJECT_NAME}"
66
volumes:
77
- .:/app:delegated
@@ -118,7 +118,7 @@ services:
118118
profiles:
119119
- search
120120
elastic:
121-
image: docker.elastic.co/elasticsearch/elasticsearch:8.18.2
121+
image: docker.elastic.co/elasticsearch/elasticsearch:8.19.3
122122
container_name: "${COMPOSE_PROJECT_NAME}-elastic"
123123
environment:
124124
- node.name="${COMPOSE_PROJECT_NAME}-elastic"

0 commit comments

Comments
 (0)