Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion .docker/cli.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# check=skip=SecretsUsedInArgOrEnv
# CLI container.
#
# All CLI operations performed in this container.
#
# The `PACKAGE_TOKEN` argument below is flagged by name by the
# `SecretsUsedInArgOrEnv` build check, but the token is passed as a build
# secret and never written to an image layer, so that check is skipped.
#
Comment thread
coderabbitai[bot] marked this conversation as resolved.
# hadolint global ignore=DL3018,SC2174
#
# @see https://hub.docker.com/r/uselagoon/php-8.4-cli-drupal/tags
Expand Down Expand Up @@ -42,8 +47,11 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \
COMPOSER_CACHE_DIR=/tmp/.composer/cache

# Allow custom PHP runtime configuration for Drush CLI commands.
# The leading colon appends to the default scan directories.
# The argument is declared so the reference resolves cleanly; when the base
# image does not set it, the value stays empty and the leading colon appends
# to the default scan directories.
# @see https://github.com/drevops/vortex/issues/1913
ARG PHP_INI_SCAN_DIR=""
ENV PHP_INI_SCAN_DIR="${PHP_INI_SCAN_DIR}:/app/drush/php-ini"

# Starting from this line, Docker adds the result of each command as a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# check=skip=SecretsUsedInArgOrEnv
# CLI container.
#
# All CLI operations performed in this container.
#
# The `PACKAGE_TOKEN` argument below is flagged by name by the
# `SecretsUsedInArgOrEnv` build check, but the token is passed as a build
# secret and never written to an image layer, so that check is skipped.
#
# hadolint global ignore=DL3018,SC2174
#
# @see https://hub.docker.com/r/uselagoon/php-8.4-cli-drupal/tags
Expand Down Expand Up @@ -42,8 +47,11 @@ ENV COMPOSER_ALLOW_SUPERUSER=1 \
COMPOSER_CACHE_DIR=/tmp/.composer/cache

# Allow custom PHP runtime configuration for Drush CLI commands.
# The leading colon appends to the default scan directories.
# The argument is declared so the reference resolves cleanly; when the base
# image does not set it, the value stays empty and the leading colon appends
# to the default scan directories.
# @see https://github.com/drevops/vortex/issues/1913
ARG PHP_INI_SCAN_DIR=""
ENV PHP_INI_SCAN_DIR="${PHP_INI_SCAN_DIR}:/app/drush/php-ini"

# Starting from this line, Docker adds the result of each command as a
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -16,7 +16,7 @@
@@ -21,7 +21,7 @@
ARG LAGOON_PR_HEAD_SHA=""
ENV LAGOON_PR_HEAD_SHA=${LAGOON_PR_HEAD_SHA}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -16,7 +16,7 @@
@@ -21,7 +21,7 @@
ARG LAGOON_PR_HEAD_SHA=""
ENV LAGOON_PR_HEAD_SHA=${LAGOON_PR_HEAD_SHA}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -32,7 +32,7 @@
@@ -37,7 +37,7 @@
ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -32,7 +32,7 @@
@@ -37,7 +37,7 @@
ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}

Expand All @@ -7,7 +7,7 @@
ENV DRUPAL_THEME=${DRUPAL_THEME}

ARG VORTEX_FRONTEND_BUILD_SKIP="0"
@@ -86,12 +86,5 @@
@@ -94,12 +94,5 @@

# Create file directories and set correct permissions.
RUN mkdir -p -m 2775 "/app/${WEBROOT}/${DRUPAL_PUBLIC_FILES}" "/app/${WEBROOT}/${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -32,7 +32,7 @@
@@ -37,7 +37,7 @@
ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -32,7 +32,7 @@
@@ -37,7 +37,7 @@
ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}

Expand All @@ -7,7 +7,7 @@
ENV DRUPAL_THEME=${DRUPAL_THEME}

ARG VORTEX_FRONTEND_BUILD_SKIP="0"
@@ -86,12 +86,5 @@
@@ -94,12 +94,5 @@

# Create file directories and set correct permissions.
RUN mkdir -p -m 2775 "/app/${WEBROOT}/${DRUPAL_PUBLIC_FILES}" "/app/${WEBROOT}/${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -32,7 +32,7 @@
@@ -37,7 +37,7 @@
ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}

Expand All @@ -7,7 +7,7 @@
ENV DRUPAL_THEME=${DRUPAL_THEME}

ARG VORTEX_FRONTEND_BUILD_SKIP="0"
@@ -86,12 +86,5 @@
@@ -94,12 +94,5 @@

# Create file directories and set correct permissions.
RUN mkdir -p -m 2775 "/app/${WEBROOT}/${DRUPAL_PUBLIC_FILES}" "/app/${WEBROOT}/${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -32,7 +32,7 @@
@@ -37,7 +37,7 @@
ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}

Expand All @@ -7,7 +7,7 @@
ENV DRUPAL_THEME=${DRUPAL_THEME}

ARG VORTEX_FRONTEND_BUILD_SKIP="0"
@@ -86,12 +86,5 @@
@@ -94,12 +94,5 @@

# Create file directories and set correct permissions.
RUN mkdir -p -m 2775 "/app/${WEBROOT}/${DRUPAL_PUBLIC_FILES}" "/app/${WEBROOT}/${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -32,7 +32,7 @@
@@ -37,7 +37,7 @@
ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}

Expand All @@ -7,7 +7,7 @@
ENV DRUPAL_THEME=${DRUPAL_THEME}

ARG VORTEX_FRONTEND_BUILD_SKIP="0"
@@ -86,12 +86,5 @@
@@ -94,12 +94,5 @@

# Create file directories and set correct permissions.
RUN mkdir -p -m 2775 "/app/${WEBROOT}/${DRUPAL_PUBLIC_FILES}" "/app/${WEBROOT}/${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -32,7 +32,7 @@
@@ -37,7 +37,7 @@
ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}

Expand All @@ -7,7 +7,7 @@
ENV DRUPAL_THEME=${DRUPAL_THEME}

ARG VORTEX_FRONTEND_BUILD_SKIP="0"
@@ -86,12 +86,5 @@
@@ -94,12 +94,5 @@

# Create file directories and set correct permissions.
RUN mkdir -p -m 2775 "/app/${WEBROOT}/${DRUPAL_PUBLIC_FILES}" "/app/${WEBROOT}/${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@@ -32,7 +32,7 @@
@@ -37,7 +37,7 @@
ARG DRUPAL_TEMPORARY_FILES="${TMP:-/tmp}"
ENV DRUPAL_TEMPORARY_FILES=${DRUPAL_TEMPORARY_FILES}

Expand All @@ -7,7 +7,7 @@
ENV DRUPAL_THEME=${DRUPAL_THEME}

ARG VORTEX_FRONTEND_BUILD_SKIP="0"
@@ -86,12 +86,5 @@
@@ -94,12 +94,5 @@

# Create file directories and set correct permissions.
RUN mkdir -p -m 2775 "/app/${WEBROOT}/${DRUPAL_PUBLIC_FILES}" "/app/${WEBROOT}/${DRUPAL_PRIVATE_FILES}" "${DRUPAL_TEMPORARY_FILES}"
Expand Down