From 3902d3fc477b4873a7dfe4c77b044c6772e5c45d Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Fri, 28 Oct 2022 14:43:15 +0300 Subject: [PATCH] merge-junit utility, facessat2 patch update --- .github/workflows/dockerimage.yml | 18 +++++++++--------- .gitignore | 1 + 1.16-3.13/Dockerfile | 5 ++++- 1.16/Dockerfile | 5 ++++- 1.17-3.13/Dockerfile | 5 ++++- 1.17/Dockerfile | 5 ++++- 1.18-3.13/Dockerfile | 5 ++++- 1.18/Dockerfile | 5 ++++- 1.19-3.13/Dockerfile | 5 ++++- 1.19-nofaccessat2/Dockerfile | 18 ++++++++++-------- 1.19-nofaccessat2/disable_faccessat2.patch | 19 ++++++++++++++----- 1.19/Dockerfile | 5 ++++- 12 files changed, 66 insertions(+), 30 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 74eefea..6fb4788 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -9,12 +9,12 @@ jobs: - uses: actions/checkout@v3 - name: Build the Docker image run: | - docker run -i $(docker build -q 1.16) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version&& which gocov && go-junit-report -version && dumb-init --version" - docker run -i $(docker build -q 1.16-3.13) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version" - docker run -i $(docker build -q 1.17) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version" - docker run -i $(docker build -q 1.17-3.13) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version" - docker run -i $(docker build -q 1.18) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version" - docker run -i $(docker build -q 1.18-3.13) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version" - docker run -i $(docker build -q 1.19) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version" - docker run -i $(docker build -q 1.19-3.13) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version" - docker run -i $(docker build -q 1.19-nofaccessat2) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version" + docker run -i $(docker build -q 1.16) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version&& which gocov && go-junit-report -version && dumb-init --version && merge-junit --version" + docker run -i $(docker build -q 1.16-3.13) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version && merge-junit --version" + docker run -i $(docker build -q 1.17) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version && merge-junit --version" + docker run -i $(docker build -q 1.17-3.13) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version && merge-junit --version" + docker run -i $(docker build -q 1.18) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version && merge-junit --version" + docker run -i $(docker build -q 1.18-3.13) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version && merge-junit --version" + docker run -i $(docker build -q 1.19) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version && merge-junit --version" + docker run -i $(docker build -q 1.19-3.13) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version && merge-junit --version" + docker run -i $(docker build -q 1.19-nofaccessat2) /bin/sh -c "go version && bash --version && make --version && git --version && gcc --version && jq --version && curl --version && air -v && dlv version && which gocov && go-junit-report -version && dumb-init --version && merge-junit --version" diff --git a/.gitignore b/.gitignore index e43b0f9..a918fcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS_Store +temp diff --git a/1.16-3.13/Dockerfile b/1.16-3.13/Dockerfile index 9b961d5..c302b0d 100644 --- a/1.16-3.13/Dockerfile +++ b/1.16-3.13/Dockerfile @@ -5,6 +5,9 @@ RUN set -eux; \ go install github.com/cosmtrek/air@latest && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ - chmod -R 777 "$GOPATH" + chmod -R 777 "$GOPATH" && \ + curl -L https://github.com/tobni/merge-junit/releases/download/v0.1.4/merge-junit-v0.1.4-x86_64-unknown-linux-musl.tar.gz | tar -xz && \ + mv ./merge-junit-v0.1.4-x86_64-unknown-linux-musl/merge-junit /usr/bin/merge-junit && \ + rm -rf /merge-junit-v0.1.4-x86_64-unknown-linux-musl WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.16/Dockerfile b/1.16/Dockerfile index 12ba49a..85f0b30 100644 --- a/1.16/Dockerfile +++ b/1.16/Dockerfile @@ -5,6 +5,9 @@ RUN set -eux; \ go install github.com/cosmtrek/air@latest && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ - chmod -R 777 "$GOPATH" + chmod -R 777 "$GOPATH" && \ + curl -L https://github.com/tobni/merge-junit/releases/download/v0.1.4/merge-junit-v0.1.4-x86_64-unknown-linux-musl.tar.gz | tar -xz && \ + mv ./merge-junit-v0.1.4-x86_64-unknown-linux-musl/merge-junit /usr/bin/merge-junit && \ + rm -rf /merge-junit-v0.1.4-x86_64-unknown-linux-musl WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.17-3.13/Dockerfile b/1.17-3.13/Dockerfile index 2ae56d9..314dc54 100644 --- a/1.17-3.13/Dockerfile +++ b/1.17-3.13/Dockerfile @@ -5,6 +5,9 @@ RUN set -eux; \ go install github.com/cosmtrek/air@latest && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ - chmod -R 777 "$GOPATH" + chmod -R 777 "$GOPATH" && \ + curl -L https://github.com/tobni/merge-junit/releases/download/v0.1.4/merge-junit-v0.1.4-x86_64-unknown-linux-musl.tar.gz | tar -xz && \ + mv ./merge-junit-v0.1.4-x86_64-unknown-linux-musl/merge-junit /usr/bin/merge-junit && \ + rm -rf /merge-junit-v0.1.4-x86_64-unknown-linux-musl WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.17/Dockerfile b/1.17/Dockerfile index 3910d51..fc15d24 100644 --- a/1.17/Dockerfile +++ b/1.17/Dockerfile @@ -5,6 +5,9 @@ RUN set -eux; \ go install github.com/cosmtrek/air@latest && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ - chmod -R 777 "$GOPATH" + chmod -R 777 "$GOPATH" && \ + curl -L https://github.com/tobni/merge-junit/releases/download/v0.1.4/merge-junit-v0.1.4-x86_64-unknown-linux-musl.tar.gz | tar -xz && \ + mv ./merge-junit-v0.1.4-x86_64-unknown-linux-musl/merge-junit /usr/bin/merge-junit && \ + rm -rf /merge-junit-v0.1.4-x86_64-unknown-linux-musl WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.18-3.13/Dockerfile b/1.18-3.13/Dockerfile index 8ac8236..7991d2b 100644 --- a/1.18-3.13/Dockerfile +++ b/1.18-3.13/Dockerfile @@ -96,6 +96,9 @@ RUN set -eux; \ go install github.com/cosmtrek/air@latest && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ - chmod -R 777 "$GOPATH" + chmod -R 777 "$GOPATH" && \ + curl -L https://github.com/tobni/merge-junit/releases/download/v0.1.4/merge-junit-v0.1.4-x86_64-unknown-linux-musl.tar.gz | tar -xz && \ + mv ./merge-junit-v0.1.4-x86_64-unknown-linux-musl/merge-junit /usr/bin/merge-junit && \ + rm -rf /merge-junit-v0.1.4-x86_64-unknown-linux-musl WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.18/Dockerfile b/1.18/Dockerfile index c948de9..13582c3 100644 --- a/1.18/Dockerfile +++ b/1.18/Dockerfile @@ -5,6 +5,9 @@ RUN set -eux; \ go install github.com/cosmtrek/air@latest && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ - chmod -R 777 "$GOPATH" + chmod -R 777 "$GOPATH" && \ + curl -L https://github.com/tobni/merge-junit/releases/download/v0.1.4/merge-junit-v0.1.4-x86_64-unknown-linux-musl.tar.gz | tar -xz && \ + mv ./merge-junit-v0.1.4-x86_64-unknown-linux-musl/merge-junit /usr/bin/merge-junit && \ + rm -rf /merge-junit-v0.1.4-x86_64-unknown-linux-musl WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.19-3.13/Dockerfile b/1.19-3.13/Dockerfile index 374b2b8..9fca727 100644 --- a/1.19-3.13/Dockerfile +++ b/1.19-3.13/Dockerfile @@ -96,6 +96,9 @@ RUN set -eux; \ go install github.com/cosmtrek/air@latest && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ - chmod -R 777 "$GOPATH" + chmod -R 777 "$GOPATH" && \ + curl -L https://github.com/tobni/merge-junit/releases/download/v0.1.4/merge-junit-v0.1.4-x86_64-unknown-linux-musl.tar.gz | tar -xz && \ + mv ./merge-junit-v0.1.4-x86_64-unknown-linux-musl/merge-junit /usr/bin/merge-junit && \ + rm -rf /merge-junit-v0.1.4-x86_64-unknown-linux-musl WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.19-nofaccessat2/Dockerfile b/1.19-nofaccessat2/Dockerfile index 3824ede..e9ebfba 100644 --- a/1.19-nofaccessat2/Dockerfile +++ b/1.19-nofaccessat2/Dockerfile @@ -1,29 +1,31 @@ FROM golang:1.19-alpine COPY disable_faccessat2.patch /tmp/disable_faccessat2.patch RUN set -eux; \ - apk add --no-cache --virtual .build-deps gcc make patch git alpine-sdk && \ - apk add --no-cache --virtual .build-deps2 -X http://dl-cdn.alpinelinux.org/alpine/edge/testing gosu && \ + apk add --no-cache --virtual .build-deps gcc make patch git alpine-sdk coreutils cmake sudo && \ mkdir -p /var/cache/distfiles && \ chmod a+w /var/cache/distfiles && \ git clone --depth 1 --branch "v$(cat /etc/alpine-release)" git://git.alpinelinux.org/aports /tmp/aports && \ cd /tmp/aports/main/musl && \ mv /tmp/disable_faccessat2.patch /tmp/aports/main/musl/ && \ sed -i -E 's/\thandle-aux-at_base.patch/\thandle-aux-at_base.patch\n\tdisable_faccessat2.patch/' APKBUILD && \ - adduser -S builder -G abuild && \ + adduser -G abuild -g "Alpine Package Builder" -s /bin/ash -D builder && \ + echo "builder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ chown -R builder:abuild /tmp/aports && \ - gosu builder:abuild sh -c 'abuild checksum && abuild-keygen -an && abuild -r' && \ + sudo -u builder sh -c 'abuild checksum && abuild-keygen -an && abuild -r' && \ find /home/builder -iname './*.apk' -exec apk add --allow-untrusted --no-cache {} \;; \ - gosu builder:abuild sh -c 'abuild clean && abuild cleancache' && \ + sudo -u builder sh -c 'abuild clean && abuild cleancache' && \ apk del --no-network .build-deps && \ - apk del --no-network .build-deps2 && \ deluser builder && \ - rm -rf /home/builder + rm -rf /home/builder /var/cache/distfiles /tmp/aports RUN set -eux; \ apk add --no-cache bash make git gcc libc-dev jq curl dumb-init && \ go install github.com/go-delve/delve/cmd/dlv@latest && \ go install github.com/cosmtrek/air@latest && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ - chmod -R 777 "$GOPATH" + chmod -R 777 "$GOPATH" && \ + curl -L https://github.com/tobni/merge-junit/releases/download/v0.1.4/merge-junit-v0.1.4-x86_64-unknown-linux-musl.tar.gz | tar -xz && \ + mv ./merge-junit-v0.1.4-x86_64-unknown-linux-musl/merge-junit /usr/bin/merge-junit && \ + rm -rf /merge-junit-v0.1.4-x86_64-unknown-linux-musl WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.19-nofaccessat2/disable_faccessat2.patch b/1.19-nofaccessat2/disable_faccessat2.patch index 8ad2c5e..348fb7e 100644 --- a/1.19-nofaccessat2/disable_faccessat2.patch +++ b/1.19-nofaccessat2/disable_faccessat2.patch @@ -1,6 +1,6 @@ ---- musl-1.2.3/src/unistd/faccessat.c 2022-04-07 20:12:40.000000000 +0300 -+++ musl-1.2.3-nofaccessat2/src/unistd/faccessat.c 2022-08-05 17:24:41.000000000 +0300 -@@ -25,11 +25,6 @@ +--- v1.2.3/src/unistd/faccessat.c 2022-04-07 20:12:40.000000000 +0300 ++++ v1.2.1/src/unistd/faccessat.c 2020-08-04 07:21:09.000000000 +0300 +@@ -25,17 +25,12 @@ int faccessat(int fd, const char *filename, int amode, int flag) { @@ -8,7 +8,16 @@ - int ret = __syscall(SYS_faccessat2, fd, filename, amode, flag); - if (ret != -ENOSYS) return __syscall_ret(ret); - } -- - if (flag & ~AT_EACCESS) ++ if (!flag || (flag==AT_EACCESS && getuid()==geteuid() && getgid()==getegid())) ++ return syscall(SYS_faccessat, fd, filename, amode, flag); + +- if (flag & ~AT_EACCESS) ++ if (flag != AT_EACCESS) return __syscall_ret(-EINVAL); +- if (!flag || (getuid()==geteuid() && getgid()==getegid())) +- return syscall(SYS_faccessat, fd, filename, amode); +- + char stack[1024]; + sigset_t set; + pid_t pid; diff --git a/1.19/Dockerfile b/1.19/Dockerfile index 2c52d15..7ba9762 100644 --- a/1.19/Dockerfile +++ b/1.19/Dockerfile @@ -5,6 +5,9 @@ RUN set -eux; \ go install github.com/cosmtrek/air@latest && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ - chmod -R 777 "$GOPATH" + chmod -R 777 "$GOPATH" && \ + curl -L https://github.com/tobni/merge-junit/releases/download/v0.1.4/merge-junit-v0.1.4-x86_64-unknown-linux-musl.tar.gz | tar -xz && \ + mv ./merge-junit-v0.1.4-x86_64-unknown-linux-musl/merge-junit /usr/bin/merge-junit && \ + rm -rf /merge-junit-v0.1.4-x86_64-unknown-linux-musl WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"]