Skip to content

Update to use new starter site #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 11, 2024
Merged

Update to use new starter site #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dc2da0
Update commits and hashes.
rosiel Nov 14, 2023
c62ac27
Bumped the release of isle-buildkit
nigelgbanks Nov 15, 2023
9a8c2ee
Bumped buildkit version to newest working tag
ajstanley Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ CONSISTENCY=delegated
ISLANDORA_REPOSITORY=islandora

# The version of the isle-buildkit images to use.
ISLANDORA_TAG=sandbox
ISLANDORA_TAG=3.0.7

# The Docker image repository, to push/build for custom images from.
REPOSITORY=islandora
Expand Down
12 changes: 6 additions & 6 deletions drupal/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ ARG TAG
FROM ${REPOSITORY}/drupal:${TAG} AS workbench

ARG TARGETARCH
ARG WORKBENCH_COMMIT=a6404eabb32fe4b54374e40b5149cfcd847ec5e3
ARG WORKBENCH_COMMIT=b38d37e7ec0e606b55e6545b33859708861e533d
ARG WORKBENCH_FILE=${WORKBENCH_COMMIT}.tar.gz
ARG WORKBENCH_URL=https://github.com/mjordan/islandora_workbench/archive/${WORKBENCH_FILE}
ARG WORKBENCH_SHA256=3f397ad1aef8d3c41893950f10da6d66b37faf46c7757673557cb347362a549c
ARG WORKBENCH_SHA256=9292c1e89aa879affe990a5b531777ba0b6f7108033c452b31abb1f661816c57

RUN --mount=type=cache,id=sandbox-apk-${TARGETARCH},sharing=locked,target=/var/cache/apk \
apk add \
Expand All @@ -32,10 +32,10 @@ RUN --mount=type=cache,id=sandbox-downloads-${TARGETARCH},sharing=locked,target=
FROM ${REPOSITORY}/drupal:${TAG} AS demo

ARG TARGETARCH
ARG DEMO_OBJECTS_COMMIT=e0de7b1eee54f52404593e608841bcdc29da0f1f
ARG DEMO_OBJECTS_COMMIT=fb587d4cf55bbc48b5015bfcefed4d297ed06494
ARG DEMO_OBJECTS_FILE=${DEMO_OBJECTS_COMMIT}.tar.gz
ARG DEMO_OBJECTS_URL=https://github.com/Islandora-Devops/islandora_demo_objects/archive/${DEMO_OBJECTS_FILE}
ARG DEMO_OBJECTS_SHA256=3af7655a63d69017104ca55098319e288879bd13c197e00a7b2ffe51d9aa5d10
ARG DEMO_OBJECTS_SHA256=740c175297e9a9ed25b374affe540245263a3b61cb0c3856269ed1f3207da521

RUN --mount=type=cache,id=sandbox-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
download.sh \
Expand All @@ -49,10 +49,10 @@ RUN --mount=type=cache,id=sandbox-downloads-${TARGETARCH},sharing=locked,target=
FROM ${REPOSITORY}/drupal:${TAG} AS starter

ARG TARGETARCH
ARG STARTER_SITE_COMMIT=0.8.0
ARG STARTER_SITE_COMMIT=1.2.0
ARG STARTER_SITE_FILE=${STARTER_SITE_COMMIT}.tar.gz
ARG STARTER_SITE_URL=https://github.com/Islandora-Devops/islandora-starter-site/archive/${STARTER_SITE_FILE}
ARG STARTER_SITE_SHA256=47b077efb46005fcfc8e96e9cf2af5db13ef53265a01f429a52460d9d0c74962
ARG STARTER_SITE_SHA256=439d78184f63dbf82d5d04fecd5c33388fa29ab9b4d4d054d3bb7bd17c9566a3

RUN --mount=type=cache,id=sandbox-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
download.sh \
Expand Down
3 changes: 2 additions & 1 deletion drupal/rootfs/var/www/drupal/assets/patches/default_settings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ if (PHP_SAPI === 'cli') {
// Required when running Drupal behind a reverse proxy.
$settings['reverse_proxy'] = TRUE;
$settings['reverse_proxy_addresses'] = array($_SERVER['REMOTE_ADDR']);
$settings['reverse_proxy_trusted_headers'] = \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_ALL;
$settings['reverse_proxy_trusted_headers'] = \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_FOR |
\Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PROTO | \Symfony\Component\HttpFoundation\Request::HEADER_X_FORWARDED_PORT;

/**
* Private file path:
Expand Down