Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

archlinux: Release 20201220.0.11678 with GitLab Repository #9340

Merged

Conversation

hashworks
Copy link
Contributor

@hashworks hashworks commented Dec 22, 2020

Maintainers: @SantiagoTorres @shibumi @pierres @hashworks

The release was automatic [1], but the GitRepo change was done manually. This PR tests the possibility to change the GitRepo to a GitLab repository, see [2] and [3].

[1] https://gitlab.archlinux.org/archlinux/archlinux-docker/-/blob/master/.gitlab-ci.yml
[2] #9325 (comment)
[3] docker-library/docs#1854

Closes #9325

@github-actions
Copy link

Diff for 8fb10fa:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 810e213..d7dcd95 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,12 +1,12 @@
 Maintainers: Santiago Torres-Arias <santiago@archlinux.org> (@SantiagoTorres), Christian Rebischke <Chris.Rebischke@archlinux.org> (@shibumi), Pierre Schmitz <pierre@archlinux.de> (@pierres), Justin Kromlinger <hashworks@archlinux.org> (@hashworks)
-GitRepo: https://github.com/archlinux/archlinux-docker.git
+GitRepo: https://gitlab.archlinux.org/archlinux/archlinux-docker.git
 
-Tags: base-devel, base-devel-20201213.0.11146
-GitFetch: refs/tags/v20201213.0.11146
-GitCommit: f70853f3a094e3c17b37c5d5aabda2ac713deb95
+Tags: base-devel, base-devel-20201220.0.11678
+GitFetch: refs/tags/v20201220.0.11678
+GitCommit: f9d83c7a5c3cc3f14caaf45e63fd8cebfc3d2ddc
 File: Dockerfile.base-devel
 
-Tags: latest, base, base-20201213.0.11146
-GitFetch: refs/tags/v20201213.0.11146
-GitCommit: f70853f3a094e3c17b37c5d5aabda2ac713deb95
+Tags: latest, base, base-20201220.0.11678
+GitFetch: refs/tags/v20201220.0.11678
+GitCommit: f9d83c7a5c3cc3f14caaf45e63fd8cebfc3d2ddc
 File: Dockerfile.base
diff --git a/_bashbrew-list b/_bashbrew-list
index a33371b..45e2a8c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,5 @@
 archlinux:base
-archlinux:base-20201213.0.11146
+archlinux:base-20201220.0.11678
 archlinux:base-devel
-archlinux:base-devel-20201213.0.11146
+archlinux:base-devel-20201220.0.11678
 archlinux:latest
diff --git a/archlinux_base-20201213.0.11146/Dockerfile.base b/archlinux_base-20201220.0.11678/Dockerfile.base
similarity index 86%
rename from archlinux_base-20201213.0.11146/Dockerfile.base
rename to archlinux_base-20201220.0.11678/Dockerfile.base
index acffff1..3f35f7a 100644
--- a/archlinux_base-20201213.0.11146/Dockerfile.base
+++ b/archlinux_base-20201220.0.11678/Dockerfile.base
@@ -11,9 +11,9 @@
 FROM alpine:3.12 AS verify
 RUN apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
-# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20201213.0.11146
-RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/313/download)" && \
-    sha256sum -c <<< "94c7297b8d2af7bd28e59f2f4c784399c61891ce78ed7e2d4b165059b6eb03c1  base-20201213.0.11146.tar.xz" && \
+# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20201220.0.11678
+RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/345/download)" && \
+    sha256sum -c <<< "63b0a93765d1e7da0ed822de8ce4854d74d584fdb68eb8fb53b55b7bd2d94f38  base-20201220.0.11678.tar.xz" && \
     mkdir /rootfs && \
     tar -C /rootfs --extract --file "${ROOTFS}"
 
diff --git a/archlinux_base-devel-20201213.0.11146/Dockerfile.base-devel b/archlinux_base-devel-20201220.0.11678/Dockerfile.base-devel
similarity index 86%
rename from archlinux_base-devel-20201213.0.11146/Dockerfile.base-devel
rename to archlinux_base-devel-20201220.0.11678/Dockerfile.base-devel
index eb80e77..a7bc7f2 100644
--- a/archlinux_base-devel-20201213.0.11146/Dockerfile.base-devel
+++ b/archlinux_base-devel-20201220.0.11678/Dockerfile.base-devel
@@ -11,9 +11,9 @@
 FROM alpine:3.12 AS verify
 RUN apk add --no-cache curl bash
 SHELL ["/bin/bash", "-c"]
-# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20201213.0.11146
-RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/315/download)" && \
-    sha256sum -c <<< "c0c4598afe40935b83113d6c723a8a57827adcbfee6ff171720e2c0f5fc751e7  base-devel-20201213.0.11146.tar.xz" && \
+# https://gitlab.archlinux.org/archlinux/archlinux-docker/-/releases/v20201220.0.11678
+RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/347/download)" && \
+    sha256sum -c <<< "e6cb59dde28907f34a2bbfb54720ef0a9671a588aaf307544b5d1625bccdedcb  base-devel-20201220.0.11678.tar.xz" && \
     mkdir /rootfs && \
     tar -C /rootfs --extract --file "${ROOTFS}"
 

@hashworks
Copy link
Contributor Author

This MR should wait for [3] to be merged, after the merge [2] can be closed.

@hashworks
Copy link
Contributor Author

@tianon tianon merged commit a6affdc into docker-library:master Dec 22, 2020
archlinux-github pushed a commit to archlinux/archlinux-docker that referenced this pull request Dec 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants