diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f33857d..c35da28 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -248,6 +248,7 @@ pre-release: ./scripts/make-dockerfile.sh "${rootfs_file}" "${group}" "output" "curl -sOJL \"${PACKAGE_REGISTRY_URL}/${rootfs_file}\"" "${group}" sed -i "/^COPY ${rootfs_file} \/$/d" output/Dockerfile.${group} done + # See README.md###Maintenance for notes about `GITLAB_PROJECT_TOKEN` - > curl -sSf --request POST -o commit-response.json --header "PRIVATE-TOKEN: ${GITLAB_PROJECT_TOKEN}" diff --git a/Dockerfile.base b/Dockerfile.base index b595cf7..2b12600 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -14,11 +14,11 @@ FROM alpine:3.19 AS verify RUN apk add --no-cache curl tar zstd -RUN curl -sOJL "https://gitlab.archlinux.org/api/v4/projects/10185/packages/generic/rootfs/20240613.0.241242/base-20240613.0.241242.tar.zst" && \ - echo "96a45802cf18d20e7ffefe9d100f0e5d14e8712bc53409dc10cdef224dc20649 base-20240613.0.241242.tar.zst" > /tmp/sha256sums.txt && \ +RUN curl -sOJL "https://gitlab.archlinux.org/api/v4/projects/10185/packages/generic/rootfs/20240614.0.241387/base-20240614.0.241387.tar.zst" && \ + echo "ee844b9aea433b54e69e67f4190a1f1cfd2ad7b7f00fbcdabd3d445065cfa26a base-20240614.0.241387.tar.zst" > /tmp/sha256sums.txt && \ sha256sum -c /tmp/sha256sums.txt && \ mkdir /rootfs && \ - tar -C /rootfs --extract --file base-20240613.0.241242.tar.zst + tar -C /rootfs --extract --file base-20240614.0.241387.tar.zst FROM scratch AS root @@ -29,14 +29,14 @@ LABEL org.opencontainers.image.url="https://gitlab.archlinux.org/archlinux/archl LABEL org.opencontainers.image.documentation="https://wiki.archlinux.org/title/Docker#Arch_Linux" LABEL org.opencontainers.image.source="https://gitlab.archlinux.org/archlinux/archlinux-docker" LABEL org.opencontainers.image.licenses="GPL-3.0-or-later" -LABEL org.opencontainers.image.version="20240613.0.241242" -LABEL org.opencontainers.image.revision="6b71ded64e9241c92c4d480d05fa418712d7f16b" -LABEL org.opencontainers.image.created="2024-06-13T10:46:06+00:00" +LABEL org.opencontainers.image.version="20240614.0.241387" +LABEL org.opencontainers.image.revision="bd60189bf8f3c09a995e2b2891660667955808ff" +LABEL org.opencontainers.image.created="2024-06-14T09:07:20+00:00" COPY --from=verify /rootfs/ / RUN ldconfig && \ - sed -i '/BUILD_ID/a VERSION_ID=20240613.0.241242' /etc/os-release + sed -i '/BUILD_ID/a VERSION_ID=20240614.0.241387' /etc/os-release ENV LANG=C.UTF-8 CMD ["/usr/bin/bash"] diff --git a/Dockerfile.base-devel b/Dockerfile.base-devel index a669db9..21f1246 100644 --- a/Dockerfile.base-devel +++ b/Dockerfile.base-devel @@ -14,11 +14,11 @@ FROM alpine:3.19 AS verify RUN apk add --no-cache curl tar zstd -RUN curl -sOJL "https://gitlab.archlinux.org/api/v4/projects/10185/packages/generic/rootfs/20240613.0.241242/base-devel-20240613.0.241242.tar.zst" && \ - echo "6f340510e721c3109af28a17e8d028b149ea906d32e9b642c8a71ef9137559fc base-devel-20240613.0.241242.tar.zst" > /tmp/sha256sums.txt && \ +RUN curl -sOJL "https://gitlab.archlinux.org/api/v4/projects/10185/packages/generic/rootfs/20240614.0.241387/base-devel-20240614.0.241387.tar.zst" && \ + echo "8b01f8d1dbe5112a36dddb02b7102975bdbcd9752aafb8b24fa38ccc65a44d77 base-devel-20240614.0.241387.tar.zst" > /tmp/sha256sums.txt && \ sha256sum -c /tmp/sha256sums.txt && \ mkdir /rootfs && \ - tar -C /rootfs --extract --file base-devel-20240613.0.241242.tar.zst + tar -C /rootfs --extract --file base-devel-20240614.0.241387.tar.zst FROM scratch AS root @@ -29,14 +29,14 @@ LABEL org.opencontainers.image.url="https://gitlab.archlinux.org/archlinux/archl LABEL org.opencontainers.image.documentation="https://wiki.archlinux.org/title/Docker#Arch_Linux" LABEL org.opencontainers.image.source="https://gitlab.archlinux.org/archlinux/archlinux-docker" LABEL org.opencontainers.image.licenses="GPL-3.0-or-later" -LABEL org.opencontainers.image.version="20240613.0.241242" -LABEL org.opencontainers.image.revision="6b71ded64e9241c92c4d480d05fa418712d7f16b" -LABEL org.opencontainers.image.created="2024-06-13T10:46:06+00:00" +LABEL org.opencontainers.image.version="20240614.0.241387" +LABEL org.opencontainers.image.revision="bd60189bf8f3c09a995e2b2891660667955808ff" +LABEL org.opencontainers.image.created="2024-06-14T09:07:20+00:00" COPY --from=verify /rootfs/ / RUN ldconfig && \ - sed -i '/BUILD_ID/a VERSION_ID=20240613.0.241242' /etc/os-release + sed -i '/BUILD_ID/a VERSION_ID=20240614.0.241387' /etc/os-release ENV LANG=C.UTF-8 CMD ["/usr/bin/bash"] diff --git a/Dockerfile.multilib-devel b/Dockerfile.multilib-devel index e96519b..bac3b6b 100644 --- a/Dockerfile.multilib-devel +++ b/Dockerfile.multilib-devel @@ -14,11 +14,11 @@ FROM alpine:3.19 AS verify RUN apk add --no-cache curl tar zstd -RUN curl -sOJL "https://gitlab.archlinux.org/api/v4/projects/10185/packages/generic/rootfs/20240613.0.241242/multilib-devel-20240613.0.241242.tar.zst" && \ - echo "e32f322a785fbd136e224cc759e6c07ac9b89ed558b697eea859a8d1fb15f97b multilib-devel-20240613.0.241242.tar.zst" > /tmp/sha256sums.txt && \ +RUN curl -sOJL "https://gitlab.archlinux.org/api/v4/projects/10185/packages/generic/rootfs/20240614.0.241387/multilib-devel-20240614.0.241387.tar.zst" && \ + echo "0b69b89c1a70e46c4827b7ddac0035df39b8e78c407d70eb885028f7ec53b762 multilib-devel-20240614.0.241387.tar.zst" > /tmp/sha256sums.txt && \ sha256sum -c /tmp/sha256sums.txt && \ mkdir /rootfs && \ - tar -C /rootfs --extract --file multilib-devel-20240613.0.241242.tar.zst + tar -C /rootfs --extract --file multilib-devel-20240614.0.241387.tar.zst FROM scratch AS root @@ -29,14 +29,14 @@ LABEL org.opencontainers.image.url="https://gitlab.archlinux.org/archlinux/archl LABEL org.opencontainers.image.documentation="https://wiki.archlinux.org/title/Docker#Arch_Linux" LABEL org.opencontainers.image.source="https://gitlab.archlinux.org/archlinux/archlinux-docker" LABEL org.opencontainers.image.licenses="GPL-3.0-or-later" -LABEL org.opencontainers.image.version="20240613.0.241242" -LABEL org.opencontainers.image.revision="6b71ded64e9241c92c4d480d05fa418712d7f16b" -LABEL org.opencontainers.image.created="2024-06-13T10:46:06+00:00" +LABEL org.opencontainers.image.version="20240614.0.241387" +LABEL org.opencontainers.image.revision="bd60189bf8f3c09a995e2b2891660667955808ff" +LABEL org.opencontainers.image.created="2024-06-14T09:07:20+00:00" COPY --from=verify /rootfs/ / RUN ldconfig && \ - sed -i '/BUILD_ID/a VERSION_ID=20240613.0.241242' /etc/os-release + sed -i '/BUILD_ID/a VERSION_ID=20240614.0.241387' /etc/os-release ENV LANG=C.UTF-8 CMD ["/usr/bin/bash"]