File 6081-github-ci-Switch-to-new-Docker-container-n... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 6081-github-ci-Switch-to-new-Docker-container-namespace.patch of Package erlang (Revision eecee6bca81667ccdc168e9e715f9a9a)

Currently displaying revision eecee6bca81667ccdc168e9e715f9a9a , Show latest

From fe628e5d859123fd4f38f7a3ef2a61028927ab3c Mon Sep 17 00:00:00 2001
From: Tom <TD5@users.noreply.github.com>
Date: Fri, 24 Feb 2023 10:54:39 +0000
Subject: [PATCH 1/5] github-ci: Switch to new Docker container namespace

The new container namespace (ghcr.io) now supports GITHUB_TOKEN (see https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry), and when debugging locally, I found the new namespace was more robust.

To see more about the migration process in general, visit: https://docs.github.com/en/packages/working-with-a-github-packages-registry/migrating-to-the-container-registry-from-the-docker-registry
---
 .github/dockerfiles/Dockerfile.32-bit        | 2 +-
 .github/dockerfiles/Dockerfile.64-bit        | 2 +-
 .github/dockerfiles/Dockerfile.clang         | 2 +-
 .github/dockerfiles/Dockerfile.cross-compile | 2 +-
 .github/workflows/main.yaml                  | 5 ++---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/dockerfiles/Dockerfile.32-bit b/.github/dockerfiles/Dockerfile.32-bit
index f1ea96d5fb..b1df0e996c 100644
--- a/.github/dockerfiles/Dockerfile.32-bit
+++ b/.github/dockerfiles/Dockerfile.32-bit
@@ -1,4 +1,4 @@
-ARG BASE=docker.pkg.github.com/erlang/otp/i386-debian-base
+ARG BASE=ghcr.io/erlang/otp/i386-debian-base
 FROM $BASE
 
 ARG MAKEFLAGS=-j4
diff --git a/.github/dockerfiles/Dockerfile.64-bit b/.github/dockerfiles/Dockerfile.64-bit
index f3a6e31939..1cdb8cfd68 100644
--- a/.github/dockerfiles/Dockerfile.64-bit
+++ b/.github/dockerfiles/Dockerfile.64-bit
@@ -1,4 +1,4 @@
-ARG BASE=docker.pkg.github.com/erlang/otp/ubuntu-base
+ARG BASE=ghcr.io/erlang/otp/ubuntu-base
 FROM $BASE
 
 ARG MAKEFLAGS=$MAKEFLAGS
diff --git a/.github/dockerfiles/Dockerfile.clang b/.github/dockerfiles/Dockerfile.clang
index 92607dd6bb..66a50ef68f 100644
--- a/.github/dockerfiles/Dockerfile.clang
+++ b/.github/dockerfiles/Dockerfile.clang
@@ -1,4 +1,4 @@
-ARG BASE=docker.pkg.github.com/erlang/otp/ubuntu-base
+ARG BASE=ghcr.io/erlang/otp/ubuntu-base
 FROM $BASE
 ## We do a SSA lint check here
 ENV ERL_COMPILER_OPTIONS=ssalint
diff --git a/.github/dockerfiles/Dockerfile.cross-compile b/.github/dockerfiles/Dockerfile.cross-compile
index 75045f2c76..c9e9c44855 100644
--- a/.github/dockerfiles/Dockerfile.cross-compile
+++ b/.github/dockerfiles/Dockerfile.cross-compile
@@ -1,7 +1,7 @@
 ##
 ## This docker file will build Erlang on 32-bit to 64-bit x86
 ##
-ARG BASE=docker.pkg.github.com/erlang/otp/i386-debian-base
+ARG BASE=ghcr.io/erlang/otp/i386-debian-base
 FROM $BASE as build
 
 ARG MAKEFLAGS=-j4
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 26bfe9d6cf..3ff8181338 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -7,11 +7,10 @@
 ## not possible so we need to rebuild all of Erlang/OTP multiple
 ## times.
 ##
-## When ghcr.io support using the GITHUB_TOKEN we should migrate
-## over to use it instead as that should allow us to use the
+## Now that we have migrated to ghcr.io we use the
 ## built-in caching mechanisms of docker/build-push-action@v2.
 ## However as things are now we use docker directly to make things
-## work.
+## work due to historical reasons.
 ##
 
 name: Build and check Erlang/OTP
-- 
2.35.3

Places

File 6081-github-ci-Switch-to-new-Docker-container-namespace.patch of Package erlang (Revision eecee6bca81667ccdc168e9e715f9a9a)

Places