Skip to content

Commit e556ca8

Browse files
committed
Move to modern BaseContainer base image
The 'openconext' container is now based on the BaseContainers Apache 2 PHP 7.2 Composer 2 Node 14 base image. As the build tag script only utilizes npm & composer to build the tarbal, this image should suffice nicely.
1 parent 197d7ac commit e556ca8

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

.github/workflows/tag-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Pull OpenConext build container
2020
run: cd docker && ${DOCKER_COMPOSE} up -d
2121
- name: Make the release files
22-
run: cd docker && ${DOCKER_COMPOSE} exec -T openconext bash -c 'HOME=/home/runner/work/OpenConext-engineblock ./bin/makeRelease.sh ${{ steps.vars.outputs.tag }}'
22+
run: cd docker && ${DOCKER_COMPOSE} exec -T openconext bash -lc 'HOME=/home/runner/work/OpenConext-engineblock ./bin/makeRelease.sh ${{ steps.vars.outputs.tag }}'
2323
- name: Create Draft Release
2424
id: create_release
2525
uses: actions/create-release@v1

bin/makeRelease.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fi
6464

6565
# Install composer dependencies
6666
echo "Running Composer Install" &&
67-
php $(which composer) install -n --no-dev --prefer-dist -o
67+
php $(which composer) install -n --no-dev --prefer-dist --ignore-platform-req=ext-exif -o
6868

6969
if [ $? -eq 0 ]; then
7070
echo "Composer install ran"

docker/docker-compose-tag-release.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ version: "3.8"
44

55
services:
66
openconext:
7-
image: ghcr.io/openconext/openconext-containers/openconext-php-build-eb:latest
7+
image: ghcr.io/openconext/openconext-basecontainers/php72-apache2-node14-composer2:latest
88
volumes:
99
- ../:/home/runner/work/OpenConext-engineblock
1010
working_dir: /home/runner/work/OpenConext-engineblock
11-
environment:
12-
- PHPFPM_PORT=9000

0 commit comments

Comments
 (0)