From 038474b1a1ed64f6d89ffa2cd9ace78cfdd86ea8 Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Wed, 9 Aug 2023 15:42:03 +0300 Subject: [PATCH 1/2] newer go versions --- .github/workflows/buildx.yml | 12 ++++++++ .github/workflows/dockerimage.yml | 4 +++ .github/workflows/hadolint.yml | 2 +- 1.20-nofaccessat2/Dockerfile | 32 ++++++++++++++++++++++ 1.20-nofaccessat2/disable_faccessat2.patch | 23 ++++++++++++++++ 1.20-nofaccessat2/faccessat2-test.c | 10 +++++++ 1.20/Dockerfile | 14 ++++++++++ 1.21-nofaccessat2/Dockerfile | 32 ++++++++++++++++++++++ 1.21-nofaccessat2/disable_faccessat2.patch | 23 ++++++++++++++++ 1.21-nofaccessat2/faccessat2-test.c | 10 +++++++ 1.21/Dockerfile | 14 ++++++++++ README.md | 4 +-- 12 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 1.20-nofaccessat2/Dockerfile create mode 100644 1.20-nofaccessat2/disable_faccessat2.patch create mode 100644 1.20-nofaccessat2/faccessat2-test.c create mode 100644 1.20/Dockerfile create mode 100644 1.21-nofaccessat2/Dockerfile create mode 100644 1.21-nofaccessat2/disable_faccessat2.patch create mode 100644 1.21-nofaccessat2/faccessat2-test.c create mode 100644 1.21/Dockerfile diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index bfa2533..cd2f67a 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -37,6 +37,18 @@ jobs: - path: 1.19-nofaccessat2 tags: "1.19-nofaccessat2" platforms: linux/amd64,linux/arm64,linux/386 + - path: 1.20 + tags: "1.20" + platforms: linux/amd64,linux/arm64,linux/386 + - path: 1.20-nofaccessat2 + tags: "1.20-nofaccessat2" + platforms: linux/amd64,linux/arm64,linux/386 + - path: 1.21 + tags: "1.21" + platforms: linux/amd64,linux/arm64,linux/386 + - path: 1.21-nofaccessat2 + tags: "1.21-nofaccessat2" + platforms: linux/amd64,linux/arm64,linux/386 steps: - name: Checkout diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index c2beebd..0a22537 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -17,3 +17,7 @@ jobs: docker run -i $(docker build -q 1.18-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" 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-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" + docker run -i $(docker build -q 1.20) /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.20-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" + docker run -i $(docker build -q 1.21) /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.21-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/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index 11efcd1..bdc2b17 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -10,4 +10,4 @@ jobs: - run: brew install hadolint - name: Lint Dockerfiles run: | - hadolint {1.16,1.16-3.13,1.17,1.17-3.13,1.18,1.18-nofaccessat2,1.19,1.19-nofaccessat2}/Dockerfile + hadolint {1.16,1.16-3.13,1.17,1.17-3.13,1.18,1.18-nofaccessat2,1.19,1.19-nofaccessat2,1.20,1.20-nofaccessat2,1.21,1.21-nofaccessat2}/Dockerfile diff --git a/1.20-nofaccessat2/Dockerfile b/1.20-nofaccessat2/Dockerfile new file mode 100644 index 0000000..7d3367c --- /dev/null +++ b/1.20-nofaccessat2/Dockerfile @@ -0,0 +1,32 @@ +FROM golang:1.20-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 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 -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 && \ + sudo -u builder sh -c 'abuild checksum && abuild-keygen -an && abuild -r' && \ + find /home/builder -type f -name '*.apk' -exec apk add --allow-untrusted --no-cache {} \;; \ + sudo -u builder sh -c 'abuild clean && abuild cleancache' && \ + apk del --no-network .build-deps && \ + deluser 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 && \ + go install gotest.tools/gotestsum@latest && \ + 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.20-nofaccessat2/disable_faccessat2.patch b/1.20-nofaccessat2/disable_faccessat2.patch new file mode 100644 index 0000000..348fb7e --- /dev/null +++ b/1.20-nofaccessat2/disable_faccessat2.patch @@ -0,0 +1,23 @@ +--- 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) + { +- if (flag) { +- int ret = __syscall(SYS_faccessat2, fd, filename, amode, flag); +- if (ret != -ENOSYS) return __syscall_ret(ret); +- } ++ 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.20-nofaccessat2/faccessat2-test.c b/1.20-nofaccessat2/faccessat2-test.c new file mode 100644 index 0000000..71f9e9e --- /dev/null +++ b/1.20-nofaccessat2/faccessat2-test.c @@ -0,0 +1,10 @@ +#include +#include + +int main() { + // TODO: Use this code to test resulting images. + // Should not call faccessat2 under the hood. + faccessat(0, "/", R_OK, AT_EACCESS); + + return 0; +} \ No newline at end of file diff --git a/1.20/Dockerfile b/1.20/Dockerfile new file mode 100644 index 0000000..96eb53b --- /dev/null +++ b/1.20/Dockerfile @@ -0,0 +1,14 @@ +FROM golang:1.20-alpine +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 && \ + go install gotest.tools/gotestsum@latest && \ + 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.21-nofaccessat2/Dockerfile b/1.21-nofaccessat2/Dockerfile new file mode 100644 index 0000000..181ad22 --- /dev/null +++ b/1.21-nofaccessat2/Dockerfile @@ -0,0 +1,32 @@ +FROM golang:1.21-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 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 -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 && \ + sudo -u builder sh -c 'abuild checksum && abuild-keygen -an && abuild -r' && \ + find /home/builder -type f -name '*.apk' -exec apk add --allow-untrusted --no-cache {} \;; \ + sudo -u builder sh -c 'abuild clean && abuild cleancache' && \ + apk del --no-network .build-deps && \ + deluser 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 && \ + go install gotest.tools/gotestsum@latest && \ + 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.21-nofaccessat2/disable_faccessat2.patch b/1.21-nofaccessat2/disable_faccessat2.patch new file mode 100644 index 0000000..348fb7e --- /dev/null +++ b/1.21-nofaccessat2/disable_faccessat2.patch @@ -0,0 +1,23 @@ +--- 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) + { +- if (flag) { +- int ret = __syscall(SYS_faccessat2, fd, filename, amode, flag); +- if (ret != -ENOSYS) return __syscall_ret(ret); +- } ++ 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.21-nofaccessat2/faccessat2-test.c b/1.21-nofaccessat2/faccessat2-test.c new file mode 100644 index 0000000..71f9e9e --- /dev/null +++ b/1.21-nofaccessat2/faccessat2-test.c @@ -0,0 +1,10 @@ +#include +#include + +int main() { + // TODO: Use this code to test resulting images. + // Should not call faccessat2 under the hood. + faccessat(0, "/", R_OK, AT_EACCESS); + + return 0; +} \ No newline at end of file diff --git a/1.21/Dockerfile b/1.21/Dockerfile new file mode 100644 index 0000000..c39e49d --- /dev/null +++ b/1.21/Dockerfile @@ -0,0 +1,14 @@ +FROM golang:1.21-alpine +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 && \ + go install gotest.tools/gotestsum@latest && \ + 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/README.md b/README.md index c730662..2cc14c4 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ [![buildx Status](https://github.com/Neur0toxine/docker-golang-alpine/workflows/buildx/badge.svg)](https://github.com/Neur0toxine/docker-golang-alpine/actions?query=workflow%3Abuildx) [![Lint Dockerfiles](https://github.com/Neur0toxine/docker-golang-alpine/workflows/Lint%20Dockerfiles/badge.svg)](https://github.com/Neur0toxine/docker-golang-alpine/actions?query=workflow%3A%22Lint+Dockerfiles%22) -A minimal Dockerfile based on Go 1.16, 1.17, 1.18 and alpine with dumb-init and some other useful packages. +A minimal Dockerfile based on Go 1.16, 1.17, 1.18, 1.19, 1.20, 1.21 and alpine with dumb-init and some other useful packages. ## What's included -- Go 1.16 / 1.17 / 1.18 / 1.19 +- Go 1.16 / 1.17 / 1.18 / 1.19 / 1.20 / 1.21 - images with patched musl to disable `faccessat2` syscall (workaround for CI systems with docker & seccomp filter bug, [see this](https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2)) - bash - make From 661ea7b075d3dec849f23ac4fe30fe9a9264b836 Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Wed, 9 Aug 2023 15:44:18 +0300 Subject: [PATCH 2/2] fix version tag in the job --- .github/workflows/buildx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index cd2f67a..d0aab8e 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -37,7 +37,7 @@ jobs: - path: 1.19-nofaccessat2 tags: "1.19-nofaccessat2" platforms: linux/amd64,linux/arm64,linux/386 - - path: 1.20 + - path: "1.20" tags: "1.20" platforms: linux/amd64,linux/arm64,linux/386 - path: 1.20-nofaccessat2