Skip to content

Commit

Permalink
[#1184] Unpinned APK packaged versions.
Browse files Browse the repository at this point in the history
See uselagoon/lagoon-images#923 for rationale
  • Loading branch information
AlexSkrypnyk committed Feb 15, 2024
1 parent f78bb50 commit 2d5f3d1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion .docker/cli.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#
# All CLI operations performed in this container.
#
# hadolint global ignore=DL3018
#
# @see https://hub.docker.com/r/uselagoon/php-8.2-cli-drupal/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
FROM uselagoon/php-8.2-cli-drupal:24.1.0
Expand Down Expand Up @@ -38,7 +40,7 @@ ENV WEBROOT=${WEBROOT} \
# reduce build time.

# Adding more tools.
RUN apk add --no-cache ncurses=6.4_p20231125-r0 pv=1.8.5-r0 tzdata=2024a-r0
RUN apk add --no-cache ncurses pv tzdata

# Adding patches and scripts.
COPY patches /app/patches
Expand Down
4 changes: 3 additions & 1 deletion .docker/nginx-drupal.dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Nginx container.
#
# All web requests are sent to this container.
#
# hadolint global ignore=DL3018
ARG CLI_IMAGE
# hadolint ignore=DL3006
FROM ${CLI_IMAGE:-cli} as cli
Expand All @@ -13,6 +15,6 @@ FROM uselagoon/nginx-drupal:24.1.0
ARG WEBROOT=web
ENV WEBROOT=${WEBROOT}

RUN apk add --no-cache tzdata=2024a-r0
RUN apk add --no-cache tzdata

COPY --from=cli /app /app
4 changes: 3 additions & 1 deletion .docker/php.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#
# All web requests are sent from Nginx to this container.
# This container would be scaled up/down in production.
#
# hadolint global ignore=DL3018
ARG CLI_IMAGE
# hadolint ignore=DL3006
FROM ${CLI_IMAGE:-cli} as cli
Expand All @@ -10,6 +12,6 @@ FROM ${CLI_IMAGE:-cli} as cli
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
FROM uselagoon/php-8.2-fpm:24.1.0

RUN apk add --no-cache tzdata=2024a-r0
RUN apk add --no-cache tzdata

COPY --from=cli /app /app

0 comments on commit 2d5f3d1

Please sign in to comment.