From b5d5c24609dea6b6fd9db056faa0d24c024499a6 Mon Sep 17 00:00:00 2001 From: neilha Date: Fri, 15 Nov 2024 16:46:37 +0000 Subject: [PATCH] updates dockerfiles --- base.Dockerfile | 10 +++++----- builder.Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base.Dockerfile b/base.Dockerfile index 1c725c7..e76e7b3 100644 --- a/base.Dockerfile +++ b/base.Dockerfile @@ -65,7 +65,7 @@ COPY --from=builder /usr/local/include/ /usr/local/include/ COPY --from=builder /usr/local/lib/ /usr/local/lib/ COPY --from=builder /usr/local/share/ /usr/local/share/ -# Environment variables common to most GOV.UK apps. +# Environment variables common to most Publishing Platform apps. ENV APP_HOME=/app \ GEM_HOME=/usr/local/bundle \ GEM_PATH=/usr/local/lib/ruby/gems/$RUBY_MAJOR \ @@ -81,9 +81,9 @@ ENV APP_HOME=/app \ NODE_ENV=production \ BUNDLE_WITHOUT="development test cucumber" \ BOOTSNAP_CACHE_DIR=/var/cache \ - GOVUK_APP_DOMAIN=www.gov.uk \ - GOVUK_WEBSITE_ROOT=https://www.gov.uk \ - GOVUK_PROMETHEUS_EXPORTER=true \ + PUBLISHING_PLATFORM_APP_DOMAIN=www.publishing-platform.co.uk \ + PUBLISHING_PLATFORM_WEBSITE_ROOT=https://www.publishing-platform.co.uk \ + PUBLISHING_PLATFORM_PROMETHEUS_EXPORTER=true \ DEBIAN_FRONTEND=noninteractive \ TZ=Europe/London @@ -150,4 +150,4 @@ RUN set -x; \ bundle version; \ rm -r /tmp/*; -LABEL org.opencontainers.image.source=https://github.com/alphagov/govuk-ruby-images \ No newline at end of file +LABEL org.opencontainers.image.source=https://github.com/publishing-platform/publishing-platform-ruby-images \ No newline at end of file diff --git a/builder.Dockerfile b/builder.Dockerfile index 3eb2c3e..57c3d22 100644 --- a/builder.Dockerfile +++ b/builder.Dockerfile @@ -1,5 +1,5 @@ ARG RUBY_MAJOR -FROM ghcr.io/alphagov/govuk-ruby-base:${RUBY_MAJOR} +FROM ghcr.io/publishing-platform/publishing-platform-ruby-base:${RUBY_MAJOR} RUN install_packages \ g++ git gpg libc-dev libcurl4-openssl-dev libgdbm-dev libssl-dev \ @@ -14,4 +14,4 @@ RUN echo 'gem: --no-document' >> /etc/gemrc ENV SECRET_KEY_BASE_DUMMY=1 -LABEL org.opencontainers.image.source=https://github.com/alphagov/govuk-ruby-images \ No newline at end of file +LABEL org.opencontainers.image.source=https://github.com/publishing-platform/publishing-platform-ruby-images \ No newline at end of file