diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c35da28..20e75e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,12 +223,15 @@ pre-release: - $PUBLISH_OFFICIAL_LIBRARY == "TRUE" before_script: - apk update - - apk add jq curl httpie bash + - apk add jq curl bash script: - | echo "Update the description of our daily DockerHub repository at https://hub.docker.com/r/archlinux/archlinux" - TOKEN="$(http --ignore-stdin POST https://hub.docker.com/v2/users/login username="${DOCKERHUB_USERNAME}" password="${DOCKERHUB_PASSWORD}" | jq -er .token)" - http --ignore-stdin PATCH https://hub.docker.com/v2/repositories/archlinux/archlinux/ Authorization:"JWT ${TOKEN}" full_description="$(cat README.md)" + TOKEN="$(curl -X POST https://hub.docker.com/v2/users/login -H "Content-Type: application/json" -d "{\"username\": \"${DOCKERHUB_USERNAME}\", \"password\": \"${DOCKERHUB_PASSWORD}\"}" | jq -er .token)" + curl -X PATCH https://hub.docker.com/v2/repositories/archlinux/archlinux/ \ + -H "Authorization: JWT ${TOKEN}" \ + -H "Content-Type: application/json" \ + -d "{\"full_description\": $(cat README.md | jq -sR .)}" # Upload rootfs to the Generic Packages Repository for group in base base-devel multilib-devel; do diff --git a/Dockerfile.base b/Dockerfile.base index 8e1022a..4e88d53 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/20240627.0.243529/base-20240627.0.243529.tar.zst" && \ - echo "a332ab5d40a477b95a0c1951a00c83357ffb8bffc05e2b21476b03449edd164e base-20240627.0.243529.tar.zst" > /tmp/sha256sums.txt && \ +RUN curl -sOJL "https://gitlab.archlinux.org/api/v4/projects/10185/packages/generic/rootfs/20240704.0.245074/base-20240704.0.245074.tar.zst" && \ + echo "6a821680a4d7764ffaabc055ba13e600ee34f0b105976d0e22253083cab8cad3 base-20240704.0.245074.tar.zst" > /tmp/sha256sums.txt && \ sha256sum -c /tmp/sha256sums.txt && \ mkdir /rootfs && \ - tar -C /rootfs --extract --file base-20240627.0.243529.tar.zst + tar -C /rootfs --extract --file base-20240704.0.245074.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="20240627.0.243529" -LABEL org.opencontainers.image.revision="bd60189bf8f3c09a995e2b2891660667955808ff" -LABEL org.opencontainers.image.created="2024-06-27T09:07:28+00:00" +LABEL org.opencontainers.image.version="20240704.0.245074" +LABEL org.opencontainers.image.revision="61cb892bfc251e46f73e716ceb3b903ec4e9e725" +LABEL org.opencontainers.image.created="2024-07-04T17:37:53+00:00" COPY --from=verify /rootfs/ / RUN ldconfig && \ - sed -i '/BUILD_ID/a VERSION_ID=20240627.0.243529' /etc/os-release + sed -i '/BUILD_ID/a VERSION_ID=20240704.0.245074' /etc/os-release ENV LANG=C.UTF-8 CMD ["/usr/bin/bash"] diff --git a/Dockerfile.base-devel b/Dockerfile.base-devel index acbd801..a838645 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/20240627.0.243529/base-devel-20240627.0.243529.tar.zst" && \ - echo "85a2db2f2cc42f5716ee4a1e46606b66a9f73460d6d0c6d832e14452dc5d2764 base-devel-20240627.0.243529.tar.zst" > /tmp/sha256sums.txt && \ +RUN curl -sOJL "https://gitlab.archlinux.org/api/v4/projects/10185/packages/generic/rootfs/20240704.0.245074/base-devel-20240704.0.245074.tar.zst" && \ + echo "0f94f0cdfa481d488bdd07bcde93407321cce40947962788f23c46a69fb55003 base-devel-20240704.0.245074.tar.zst" > /tmp/sha256sums.txt && \ sha256sum -c /tmp/sha256sums.txt && \ mkdir /rootfs && \ - tar -C /rootfs --extract --file base-devel-20240627.0.243529.tar.zst + tar -C /rootfs --extract --file base-devel-20240704.0.245074.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="20240627.0.243529" -LABEL org.opencontainers.image.revision="bd60189bf8f3c09a995e2b2891660667955808ff" -LABEL org.opencontainers.image.created="2024-06-27T09:07:28+00:00" +LABEL org.opencontainers.image.version="20240704.0.245074" +LABEL org.opencontainers.image.revision="61cb892bfc251e46f73e716ceb3b903ec4e9e725" +LABEL org.opencontainers.image.created="2024-07-04T17:37:53+00:00" COPY --from=verify /rootfs/ / RUN ldconfig && \ - sed -i '/BUILD_ID/a VERSION_ID=20240627.0.243529' /etc/os-release + sed -i '/BUILD_ID/a VERSION_ID=20240704.0.245074' /etc/os-release ENV LANG=C.UTF-8 CMD ["/usr/bin/bash"] diff --git a/Dockerfile.multilib-devel b/Dockerfile.multilib-devel index 8bd4d71..7034112 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/20240627.0.243529/multilib-devel-20240627.0.243529.tar.zst" && \ - echo "561074fdb5c56bd7c9e728915b12760388f3098539f3ca0b2667efc4a2d17608 multilib-devel-20240627.0.243529.tar.zst" > /tmp/sha256sums.txt && \ +RUN curl -sOJL "https://gitlab.archlinux.org/api/v4/projects/10185/packages/generic/rootfs/20240704.0.245074/multilib-devel-20240704.0.245074.tar.zst" && \ + echo "585d4289c0469121052996cc4070357030bef4da65668b6e4178c39281d0d105 multilib-devel-20240704.0.245074.tar.zst" > /tmp/sha256sums.txt && \ sha256sum -c /tmp/sha256sums.txt && \ mkdir /rootfs && \ - tar -C /rootfs --extract --file multilib-devel-20240627.0.243529.tar.zst + tar -C /rootfs --extract --file multilib-devel-20240704.0.245074.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="20240627.0.243529" -LABEL org.opencontainers.image.revision="bd60189bf8f3c09a995e2b2891660667955808ff" -LABEL org.opencontainers.image.created="2024-06-27T09:07:28+00:00" +LABEL org.opencontainers.image.version="20240704.0.245074" +LABEL org.opencontainers.image.revision="61cb892bfc251e46f73e716ceb3b903ec4e9e725" +LABEL org.opencontainers.image.created="2024-07-04T17:37:53+00:00" COPY --from=verify /rootfs/ / RUN ldconfig && \ - sed -i '/BUILD_ID/a VERSION_ID=20240627.0.243529' /etc/os-release + sed -i '/BUILD_ID/a VERSION_ID=20240704.0.245074' /etc/os-release ENV LANG=C.UTF-8 CMD ["/usr/bin/bash"]