From 38a5d92f3814b071803c046144d94643a3ecb934 Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 18 Sep 2023 08:32:04 +0200 Subject: [PATCH] Change Dockerfile to upgrade packages when building (#26929) Co-authored-by: Renaud Chaput --- .github/workflows/build-container-image.yml | 7 +++++-- .github/workflows/build-releases.yml | 2 ++ Dockerfile | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-container-image.yml b/.github/workflows/build-container-image.yml index 5998794601..b9aebcc46c 100644 --- a/.github/workflows/build-container-image.yml +++ b/.github/workflows/build-container-image.yml @@ -4,6 +4,9 @@ on: platforms: required: true type: string + cache: + type: boolean + default: true use_native_arm64_builder: type: boolean push_to_images: @@ -85,5 +88,5 @@ jobs: push: ${{ inputs.push_to_images != '' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max + cache-from: ${{ inputs.cache && 'type=gha' || '' }} + cache-to: ${{ inputs.cache && 'type=gha,mode=max' || '' }} diff --git a/.github/workflows/build-releases.yml b/.github/workflows/build-releases.yml index f739a69d9a..98b9dfc0df 100644 --- a/.github/workflows/build-releases.yml +++ b/.github/workflows/build-releases.yml @@ -17,6 +17,8 @@ jobs: push_to_images: | tootsuite/mastodon ghcr.io/mastodon/mastodon + # Do not use cache when building releases, so apt update is always ran and the release always contain the latest packages + cache: false # Only tag with latest when ran against the latest stable branch # This needs to be updated after each minor version release flavor: | diff --git a/Dockerfile b/Dockerfile index 160efeea4a..c0f584dc4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,7 @@ COPY Gemfile* package.json yarn.lock /opt/mastodon/ # hadolint ignore=DL3008 RUN apt-get update && \ + apt-get -yq dist-upgrade && \ apt-get install -y --no-install-recommends build-essential \ ca-certificates \ git \