Skip to content

Commit

Permalink
Merge pull request #612 from City-of-Helsinki/UHF-9564
Browse files Browse the repository at this point in the history
UHF-9564: Update to PHP 8.3
  • Loading branch information
tuutti authored Apr 4, 2024
2 parents a93ad3c + 34cbfb2 commit 6c6d99b
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ STAGE_FILE_PROXY_ORIGIN_DIR=
COMPOSE_PROFILES=search,queue

# Docker image
DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.2
DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3

# Public webroot
DRUPAL_WEBROOT=public
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine

services:
db:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/auto-release-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ jobs:
release-pr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 1
- uses: actions/checkout@v4
- name: Create pull request
run: |
gh pr create \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
tests:
runs-on: ubuntu-latest
container:
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine
options: --hostname app

services:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/update-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
update-config:
runs-on: ubuntu-latest
container:
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.2-alpine
image: ghcr.io/city-of-helsinki/drupal-php-docker:8.3-alpine

services:
db:
Expand All @@ -31,6 +31,12 @@ jobs:
run: |
gh run download -n latest.sql
- name: Prepare setup
run: |
# We install Drupal from existing dump, so locale_install() hook
# is never fired. Make sure the translations folder exists.
mkdir -p public/sites/default/files/translations -p
- name: Build project
run: |
composer install --no-interaction
Expand Down
2 changes: 0 additions & 2 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.7'

services:
app:
container_name: "${COMPOSE_PROJECT_NAME}-app"
Expand Down
2 changes: 1 addition & 1 deletion docker/openshift/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG DRUPAL_DOCKER_TAG=8.2
ARG DRUPAL_DOCKER_TAG=8.3
FROM ghcr.io/city-of-helsinki/drupal-docker-base:${DRUPAL_DOCKER_TAG}

COPY / /var/www/html/
Expand Down
1 change: 1 addition & 0 deletions tools/make/project/install.mk
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ drush-helfi-enable-modules: ## Enable modules and base configurations.
PHONY += drush-locale-update
drush-locale-update: ## Update translations.
$(call step,Update translations...)
@mkdir -p public/sites/default/files/translations
$(call drush,state:set locale.translation_last_checked 0)
$(call drush,locale:check)
$(call drush,locale:update)
Expand Down

0 comments on commit 6c6d99b

Please sign in to comment.