Commit 7b37a547 authored by Arch Linux Docker release bot's avatar Arch Linux Docker release bot
Browse files

Release 20201114.0.8971

parent c0822798
Pipeline #2932 passed with stages
in 2 minutes and 13 seconds
...@@ -39,6 +39,8 @@ get_version: ...@@ -39,6 +39,8 @@ get_version:
stage: rootfs stage: rootfs
before_script: before_script:
- pacman -Syu --noconfirm make devtools fakechroot fakeroot - pacman -Syu --noconfirm make devtools fakechroot fakeroot
script:
- make $PWD/output/Dockerfile.$GROUP
artifacts: artifacts:
paths: paths:
- output/* - output/*
...@@ -54,8 +56,6 @@ rootfs: ...@@ -54,8 +56,6 @@ rootfs:
parallel: parallel:
matrix: matrix:
- GROUP: [base, base-devel] - GROUP: [base, base-devel]
script:
- make $PWD/output/$GROUP.tar.xz $PWD/output/Dockerfile.$GROUP
rootfs:secure: rootfs:secure:
extends: .rootfs extends: .rootfs
...@@ -70,8 +70,6 @@ rootfs:secure: ...@@ -70,8 +70,6 @@ rootfs:secure:
parallel: parallel:
matrix: matrix:
- GROUP: [base, base-devel] - GROUP: [base, base-devel]
script:
- make $PWD/output/$GROUP.tar.xz $PWD/output/Dockerfile.$GROUP
.image: .image:
stage: image stage: image
...@@ -151,22 +149,26 @@ image:publish:secure: ...@@ -151,22 +149,26 @@ image:publish:secure:
refs: refs:
- releases - releases
- tags - tags
script:
- pacman -Sy .test-script: &test-script
- pacman -Qqk - pacman -Sy
- pacman -Syu --noconfirm docker grep - pacman -Qqk
- docker -v - pacman -Syu --noconfirm docker grep
- id -u http - docker -v
- locale | grep -q UTF-8 - id -u http
- locale | grep -q UTF-8
test:base: test:base:
extends: .test extends: .test
image: $CI_REGISTRY_IMAGE:base-$CI_COMMIT_REF_SLUG image: $CI_REGISTRY_IMAGE:base-$CI_COMMIT_REF_SLUG
script:
- *test-script
test:base-devel: test:base-devel:
extends: .test extends: .test
image: $CI_REGISTRY_IMAGE:base-devel-$CI_COMMIT_REF_SLUG image: $CI_REGISTRY_IMAGE:base-devel-$CI_COMMIT_REF_SLUG
after_script: script:
- *test-script
- gcc -v - gcc -v
- g++ -v - g++ -v
- make -v - make -v
......
...@@ -11,23 +11,15 @@ ...@@ -11,23 +11,15 @@
FROM alpine:3.12 AS verify FROM alpine:3.12 AS verify
RUN apk add --no-cache curl bash RUN apk add --no-cache curl bash
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files//download)" && \ RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/177/download)" && \
sha256sum -c <<< "1b11dc084ad2d53b5a34cc964b6e4983bd540a6bfe1c61c9ce17823576d517cd base-20201113.0.8887.tar.xz" && \ sha256sum -c <<< "8511b8c907dcfe845ec246d517380c4d3fd37032296adfe2a4707ba0a97dd078 base-20201114.0.8971.tar.xz" && \
mkdir /rootfs && \ mkdir /rootfs && \
tar -C /rootfs --extract --file "${ROOTFS}" tar -C /rootfs --extract --file "${ROOTFS}"
FROM scratch AS root FROM scratch AS root
COPY --from=verify /rootfs/ / COPY --from=verify /rootfs/ /
# manually run all alpm hooks that can't be run inside the fakechroot RUN ldconfig
RUN ldconfig && update-ca-trust && locale-gen
RUN sh -c 'ls usr/lib/sysusers.d/*.conf | /usr/share/libalpm/scripts/systemd-hook sysusers '
# update /etc/os-release
RUN ln -s /usr/lib/os-release /etc/os-release
# initialize the archlinux keyring, but discard any private key that may be shipped.
RUN pacman-key --init && pacman-key --populate archlinux && bash -c "rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*"
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
CMD ["/usr/bin/bash"] CMD ["/usr/bin/bash"]
...@@ -11,23 +11,15 @@ ...@@ -11,23 +11,15 @@
FROM alpine:3.12 AS verify FROM alpine:3.12 AS verify
RUN apk add --no-cache curl bash RUN apk add --no-cache curl bash
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files//download)" && \ RUN ROOTFS="$(curl -sOJL --continue-at - -w "%{filename_effective}" https://gitlab.archlinux.org/archlinux/archlinux-docker/-/package_files/179/download)" && \
sha256sum -c <<< "70799aa132f66492e5c3645a6aff9ccb612f40b92c83f253d11fcb9f4bceca98 base-devel-20201113.0.8887.tar.xz" && \ sha256sum -c <<< "5fad138b5ac01936b79e5e0705b4e8abf26d116435bb00822e314f965b32dbc4 base-devel-20201114.0.8971.tar.xz" && \
mkdir /rootfs && \ mkdir /rootfs && \
tar -C /rootfs --extract --file "${ROOTFS}" tar -C /rootfs --extract --file "${ROOTFS}"
FROM scratch AS root FROM scratch AS root
COPY --from=verify /rootfs/ / COPY --from=verify /rootfs/ /
# manually run all alpm hooks that can't be run inside the fakechroot RUN ldconfig
RUN ldconfig && update-ca-trust && locale-gen
RUN sh -c 'ls usr/lib/sysusers.d/*.conf | /usr/share/libalpm/scripts/systemd-hook sysusers '
# update /etc/os-release
RUN ln -s /usr/lib/os-release /etc/os-release
# initialize the archlinux keyring, but discard any private key that may be shipped.
RUN pacman-key --init && pacman-key --populate archlinux && bash -c "rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*"
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
CMD ["/usr/bin/bash"] CMD ["/usr/bin/bash"]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment