From f6f98f664c4c41da38a731276b35a0f196afac40 Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Mon, 25 Mar 2024 13:01:18 +0300 Subject: [PATCH] add tzdata & fix build and readme --- 1.16-3.13/Dockerfile | 2 +- 1.16/Dockerfile | 2 +- 1.17-3.13/Dockerfile | 4 ++-- 1.17/Dockerfile | 4 ++-- 1.18-nofaccessat2/Dockerfile | 4 ++-- 1.18/Dockerfile | 4 ++-- 1.19-nofaccessat2/Dockerfile | 4 ++-- 1.19/Dockerfile | 4 ++-- 1.20-nofaccessat2/Dockerfile | 4 ++-- 1.20/Dockerfile | 4 ++-- 1.21-nofaccessat2/Dockerfile | 4 ++-- 1.21/Dockerfile | 4 ++-- 1.22-nofaccessat2/Dockerfile | 2 +- 1.22/Dockerfile | 2 +- README.md | 2 +- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/1.16-3.13/Dockerfile b/1.16-3.13/Dockerfile index a1cb84d..4cd2566 100644 --- a/1.16-3.13/Dockerfile +++ b/1.16-3.13/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.16-alpine3.13 RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@v1.9.0 && \ go install github.com/cosmtrek/air@v1.27.8 && \ go install github.com/jstemmer/go-junit-report@latest && \ diff --git a/1.16/Dockerfile b/1.16/Dockerfile index a809fb3..4328656 100644 --- a/1.16/Dockerfile +++ b/1.16/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.16-alpine RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@v1.9.0 && \ go install github.com/cosmtrek/air@v1.27.8 && \ go install github.com/jstemmer/go-junit-report@latest && \ diff --git a/1.17-3.13/Dockerfile b/1.17-3.13/Dockerfile index 3ed5a08..0aa37da 100644 --- a/1.17-3.13/Dockerfile +++ b/1.17-3.13/Dockerfile @@ -1,8 +1,8 @@ FROM golang:1.17-alpine3.13 RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@v1.9.1 && \ - go install github.com/cosmtrek/air@v1.40.0 && \ + go install github.com/cosmtrek/air@v1.40.4 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.17/Dockerfile b/1.17/Dockerfile index a2735f0..3ab1bea 100644 --- a/1.17/Dockerfile +++ b/1.17/Dockerfile @@ -1,8 +1,8 @@ FROM golang:1.17-alpine RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@v1.9.1 && \ - go install github.com/cosmtrek/air@v1.40.0 && \ + go install github.com/cosmtrek/air@v1.40.4 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.18-nofaccessat2/Dockerfile b/1.18-nofaccessat2/Dockerfile index 53d3b99..3af7de8 100644 --- a/1.18-nofaccessat2/Dockerfile +++ b/1.18-nofaccessat2/Dockerfile @@ -18,9 +18,9 @@ RUN set -eux; \ 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 mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@latest && \ - go install github.com/cosmtrek/air@latest && \ + go install github.com/cosmtrek/air@v1.40.4 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.18/Dockerfile b/1.18/Dockerfile index f9c88fc..d1de7d8 100644 --- a/1.18/Dockerfile +++ b/1.18/Dockerfile @@ -1,8 +1,8 @@ FROM golang:1.18-alpine RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@latest && \ - go install github.com/cosmtrek/air@latest && \ + go install github.com/cosmtrek/air@v1.40.4 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.19-nofaccessat2/Dockerfile b/1.19-nofaccessat2/Dockerfile index f86f6ff..1fa9c1d 100644 --- a/1.19-nofaccessat2/Dockerfile +++ b/1.19-nofaccessat2/Dockerfile @@ -18,9 +18,9 @@ RUN set -eux; \ 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 mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@latest && \ - go install github.com/cosmtrek/air@latest && \ + go install github.com/cosmtrek/air@v1.41.0 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.19/Dockerfile b/1.19/Dockerfile index 8f1f9d0..db395a7 100644 --- a/1.19/Dockerfile +++ b/1.19/Dockerfile @@ -1,8 +1,8 @@ FROM golang:1.19-alpine RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@latest && \ - go install github.com/cosmtrek/air@latest && \ + go install github.com/cosmtrek/air@v1.41.0 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.20-nofaccessat2/Dockerfile b/1.20-nofaccessat2/Dockerfile index 694fa05..410a9d2 100644 --- a/1.20-nofaccessat2/Dockerfile +++ b/1.20-nofaccessat2/Dockerfile @@ -18,9 +18,9 @@ RUN set -eux; \ 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 mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@latest && \ - go install github.com/cosmtrek/air@latest && \ + go install github.com/cosmtrek/air@v1.44.0 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.20/Dockerfile b/1.20/Dockerfile index 38951a4..2e4fdae 100644 --- a/1.20/Dockerfile +++ b/1.20/Dockerfile @@ -1,8 +1,8 @@ FROM golang:1.20-alpine RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@latest && \ - go install github.com/cosmtrek/air@latest && \ + go install github.com/cosmtrek/air@v1.44.0 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.21-nofaccessat2/Dockerfile b/1.21-nofaccessat2/Dockerfile index fb4a5ff..c36dd63 100644 --- a/1.21-nofaccessat2/Dockerfile +++ b/1.21-nofaccessat2/Dockerfile @@ -18,9 +18,9 @@ RUN set -eux; \ 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 mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@latest && \ - go install github.com/cosmtrek/air@latest && \ + go install github.com/cosmtrek/air@v1.49.0 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.21/Dockerfile b/1.21/Dockerfile index 85a6c6c..a769832 100644 --- a/1.21/Dockerfile +++ b/1.21/Dockerfile @@ -1,8 +1,8 @@ FROM golang:1.21-alpine RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ go install github.com/go-delve/delve/cmd/dlv@latest && \ - go install github.com/cosmtrek/air@latest && \ + go install github.com/cosmtrek/air@v1.49.0 && \ go install github.com/jstemmer/go-junit-report@latest && \ go install github.com/axw/gocov/gocov@latest && \ go install gotest.tools/gotestsum@latest && \ diff --git a/1.22-nofaccessat2/Dockerfile b/1.22-nofaccessat2/Dockerfile index ec2f583..65f7ae9 100644 --- a/1.22-nofaccessat2/Dockerfile +++ b/1.22-nofaccessat2/Dockerfile @@ -18,7 +18,7 @@ RUN set -eux; \ 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 mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ 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 && \ diff --git a/1.22/Dockerfile b/1.22/Dockerfile index 9efcf90..49f4afe 100644 --- a/1.22/Dockerfile +++ b/1.22/Dockerfile @@ -1,6 +1,6 @@ FROM golang:1.22-alpine RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap && \ + apk add --no-cache bash make git gcc libc-dev jq curl dumb-init mailcap tzdata && \ 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 && \ diff --git a/README.md b/README.md index 2cc14c4..5c338ef 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A minimal Dockerfile based on Go 1.16, 1.17, 1.18, 1.19, 1.20, 1.21 and alpine w ## What's included -- Go 1.16 / 1.17 / 1.18 / 1.19 / 1.20 / 1.21 +- Go 1.16 / 1.17 / 1.18 / 1.19 / 1.20 / 1.21 / 1.22 - 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