From a73b9332997d7b3652c22a6f8c16ef7476d47de6 Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Tue, 26 Jul 2022 19:39:53 +0300 Subject: [PATCH] more utilites, removed unsupported architectures, simplified installation for delve --- .github/workflows/buildx.yml | 14 +++--- 1.16-3.13/Dockerfile | 13 ++---- 1.16/Dockerfile | 13 ++---- 1.17-3.13/Dockerfile | 13 ++---- 1.17/Dockerfile | 13 ++---- 1.18-3.13/Dockerfile | 90 +++++++++++++++--------------------- 1.18/Dockerfile | 13 ++---- README.md | 3 ++ 8 files changed, 72 insertions(+), 100 deletions(-) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 294d41c..682c117 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -15,22 +15,22 @@ jobs: docker-file: - path: 1.16 tags: "1.16" - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/386 - path: 1.16-3.13 tags: "1.16-3.13" - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/386 - path: 1.17 tags: "1.17" - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/386 - path: 1.17-3.13 tags: "1.17-3.13" - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/386 - path: 1.18 tags: "1.18" - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/386 - path: 1.18-3.13 tags: "1.18-3.13" - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64,linux/386 steps: - name: Checkout @@ -39,7 +39,7 @@ jobs: - name: Prepare id: prepare run: | - DOCKER_IMAGE=neur0toxine/golang-alpine-dumb-init + DOCKER_IMAGE=neur0toxine/golang-alpine TEMP="${{ matrix.docker-file.tags }}" TAGZ=($TEMP) diff --git a/1.16-3.13/Dockerfile b/1.16-3.13/Dockerfile index 3928660..9b961d5 100644 --- a/1.16-3.13/Dockerfile +++ b/1.16-3.13/Dockerfile @@ -1,13 +1,10 @@ FROM golang:1.16-alpine3.13 RUN set -eux; \ apk add --no-cache bash make git gcc libc-dev jq curl dumb-init && \ - cd /tmp && \ - git clone https://github.com/go-delve/delve && \ - cd delve && \ - go install github.com/go-delve/delve/cmd/dlv && \ - cd / && \ - go install github.com/cosmtrek/air@latest && \ - rm -rf delve && \ - chmod -R 777 /go + 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" WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.16/Dockerfile b/1.16/Dockerfile index a62c84a..12ba49a 100644 --- a/1.16/Dockerfile +++ b/1.16/Dockerfile @@ -1,13 +1,10 @@ FROM golang:1.16-alpine RUN set -eux; \ apk add --no-cache bash make git gcc libc-dev jq curl dumb-init && \ - cd /tmp && \ - git clone https://github.com/go-delve/delve && \ - cd delve && \ - go install github.com/go-delve/delve/cmd/dlv && \ - cd / && \ - go install github.com/cosmtrek/air@latest && \ - rm -rf delve && \ - chmod -R 777 /go + 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" WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.17-3.13/Dockerfile b/1.17-3.13/Dockerfile index 1b9dc82..2ae56d9 100644 --- a/1.17-3.13/Dockerfile +++ b/1.17-3.13/Dockerfile @@ -1,13 +1,10 @@ FROM golang:1.17-alpine3.13 RUN set -eux; \ apk add --no-cache bash make git gcc libc-dev jq curl dumb-init && \ - cd /tmp && \ - git clone https://github.com/go-delve/delve && \ - cd delve && \ - go install github.com/go-delve/delve/cmd/dlv && \ - cd / && \ - go install github.com/cosmtrek/air@latest && \ - rm -rf delve && \ - chmod -R 777 /go + 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" WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.17/Dockerfile b/1.17/Dockerfile index b57cf3f..3910d51 100644 --- a/1.17/Dockerfile +++ b/1.17/Dockerfile @@ -1,13 +1,10 @@ FROM golang:1.17-alpine RUN set -eux; \ apk add --no-cache bash make git gcc libc-dev jq curl dumb-init && \ - cd /tmp && \ - git clone https://github.com/go-delve/delve && \ - cd delve && \ - go install github.com/go-delve/delve/cmd/dlv && \ - cd / && \ - go install github.com/cosmtrek/air@latest && \ - rm -rf delve && \ - chmod -R 777 /go + 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" WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.18-3.13/Dockerfile b/1.18-3.13/Dockerfile index 180d57d..88ec434 100644 --- a/1.18-3.13/Dockerfile +++ b/1.18-3.13/Dockerfile @@ -1,20 +1,13 @@ FROM alpine:3.13 -RUN apk add --no-cache ca-certificates - -# set up nsswitch.conf for Go's "netgo" implementation -# - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 -# - docker run --rm debian grep '^hosts:' /etc/nsswitch.conf -RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf - ENV PATH /usr/local/go/bin:$PATH -ENV GOLANG_VERSION 1.18.4 - RUN set -eux; \ + apk add --no-cache ca-certificates jq curl; \ + ([ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf); \ apk add --no-cache --virtual .fetch-deps gnupg; \ arch="$(apk --print-arch)"; \ - url=; \ + export GOVERSION="$(curl -fsSL 'https://go.dev/dl/?mode=json&include=1.18' | jq -r '.[0].version')"; \ case "$arch" in \ 'x86_64') \ export GOAMD64='v1' GOARCH='amd64' GOOS='linux'; \ @@ -39,14 +32,10 @@ RUN set -eux; \ ;; \ *) echo >&2 "error: unsupported architecture '$arch' (likely packaging update needed)"; exit 1 ;; \ esac; \ - build=; \ - if [ -z "$url" ]; then \ # https://github.com/golang/go/issues/38536#issuecomment-616897960 - build=1; \ - url='https://dl.google.com/go/go1.18.4.src.tar.gz'; \ - sha256='4525aa6b0e3cecb57845f4060a7075aafc9ab752bb7b6b4cf8a212d43078e1e4'; \ + url="https://dl.google.com/go/$GOVERSION.src.tar.gz"; \ + sha256='4525aa6b0e3cecb57845f4060a7075aafc9ab752bb7b6b4cf8a212d43078e1e4'; \ # the precompiled binaries published by Go upstream are not compatible with Alpine, so we always build from source here 😅 - fi; \ \ wget -O go.tgz.asc "$url.asc"; \ wget -O go.tgz "$url"; \ @@ -65,36 +54,34 @@ RUN set -eux; \ tar -C /usr/local -xzf go.tgz; \ rm go.tgz; \ \ - if [ -n "$build" ]; then \ - apk add --no-cache --virtual .build-deps \ - bash \ - gcc \ - go \ - musl-dev \ - ; \ - \ - export GOCACHE='/tmp/gocache'; \ - \ - ( \ - cd /usr/local/go/src; \ + apk add --no-cache --virtual .build-deps \ + bash \ + gcc \ + go \ + musl-dev \ + ; \ + \ + export GOCACHE='/tmp/gocache'; \ + \ + ( \ + cd /usr/local/go/src; \ # set GOROOT_BOOTSTRAP + GOHOST* such that we can build Go successfully - export GOROOT_BOOTSTRAP="$(go env GOROOT)" GOHOSTOS="$GOOS" GOHOSTARCH="$GOARCH"; \ - ./make.bash; \ - ); \ - \ - apk del --no-network .build-deps; \ - \ + export GOROOT_BOOTSTRAP="$(go env GOROOT)" GOHOSTOS="$GOOS" GOHOSTARCH="$GOARCH"; \ + ./make.bash; \ + ); \ + \ + apk del --no-network .build-deps; \ + \ # remove a few intermediate / bootstrapping files the official binary release tarballs do not contain - rm -rf \ - /usr/local/go/pkg/*/cmd \ - /usr/local/go/pkg/bootstrap \ - /usr/local/go/pkg/obj \ - /usr/local/go/pkg/tool/*/api \ - /usr/local/go/pkg/tool/*/go_bootstrap \ - /usr/local/go/src/cmd/dist/dist \ - "$GOCACHE" \ - ; \ - fi; \ + rm -rf \ + /usr/local/go/pkg/*/cmd \ + /usr/local/go/pkg/bootstrap \ + /usr/local/go/pkg/obj \ + /usr/local/go/pkg/tool/*/api \ + /usr/local/go/pkg/tool/*/go_bootstrap \ + /usr/local/go/src/cmd/dist/dist \ + "$GOCACHE" \ + ; \ \ apk del --no-network .fetch-deps; \ \ @@ -106,14 +93,11 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" WORKDIR $GOPATH RUN set -eux; \ - apk add --no-cache bash make git gcc libc-dev jq curl dumb-init && \ - cd /tmp && \ - git clone https://github.com/go-delve/delve && \ - cd delve && \ - go install github.com/go-delve/delve/cmd/dlv && \ - cd / && \ - go install github.com/cosmtrek/air@latest && \ - rm -rf delve && \ - chmod -R 777 /go + apk add --no-cache bash make git gcc libc-dev 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" WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/1.18/Dockerfile b/1.18/Dockerfile index fec8d93..c948de9 100644 --- a/1.18/Dockerfile +++ b/1.18/Dockerfile @@ -1,13 +1,10 @@ FROM golang:1.18-alpine RUN set -eux; \ apk add --no-cache bash make git gcc libc-dev jq curl dumb-init && \ - cd /tmp && \ - git clone https://github.com/go-delve/delve && \ - cd delve && \ - go install github.com/go-delve/delve/cmd/dlv && \ - cd / && \ - go install github.com/cosmtrek/air@latest && \ - rm -rf delve && \ - chmod -R 777 /go + 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" WORKDIR / ENTRYPOINT ["/usr/bin/dumb-init", "--"] diff --git a/README.md b/README.md index 09448c9..fb584bf 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ A minimal Dockerfile based on Go 1.16, 1.17, 1.18 and alpine with dumb-init and - jq - curl - air +- delve +- gocov +- go-junit-report - dumb-init ### Available platforms