From e8fe68f2136e44c7fe6b5eaaa176c3ccfb5acca5 Mon Sep 17 00:00:00 2001 From: gythialy Date: Fri, 22 Jan 2021 09:38:53 +0800 Subject: [PATCH] feat: support golang v1.15.7 --- .github/workflows/dockerimage.yml | 4 ++-- Dockerfile | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 060d816..eab542d 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -11,13 +11,13 @@ jobs: steps: - uses: actions/checkout@v2 - name: Build and Publish the Docker image to DockerHub - uses: gythialy/Publish-Docker-Github-Action@master + uses: docker://goreng/publish-docker-github-action:v2.5 with: name: goreng/golang-cross username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and Publish the Docker image to GitHub Packages - uses: gythialy/Publish-Docker-Github-Action@master + uses: docker://goreng/publish-docker-github-action:v2.5 with: name: docker.pkg.github.com/gythialy/golang-cross/xcgo username: gythialy diff --git a/Dockerfile b/Dockerfile index 6820455..e32364a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="Goren G" COPY entrypoint.sh / -ARG GOLANG_VERSION=1.15.6 -ARG GOLANG_DIST_SHA=3918e6cc85e7eaaa6f859f1bdbaac772e7a825b0eb423c63d3ae68b21f84b844 +ARG GOLANG_VERSION=1.15.7 +ARG GOLANG_DIST_SHA=0d142143794721bb63ce6c8a6180c4062bcf8ef4715e7d6d6609f3a8282629b3 # update golang RUN \ @@ -17,8 +17,8 @@ RUN \ rm go.tgz; # install goreleaser -ARG GORELEASER_VERSION=0.149.0 -ARG GORELEASER_SHA=a227362d734cda47f7ebed9762e6904edcd115a65084384ecfbad2baebc4c775 +ARG GORELEASER_VERSION=0.155.0 +ARG GORELEASER_SHA=2a33aa15933cfd5bd2b714860c4876fa76f1fab8f46a7c6d29a8e32c7f9445f2 RUN \ GORELEASER_DOWNLOAD_FILE=goreleaser_Linux_x86_64.tar.gz && \ GORELEASER_DOWNLOAD_URL=https://github.com/goreleaser/goreleaser/releases/download/v${GORELEASER_VERSION}/${GORELEASER_DOWNLOAD_FILE} && \ @@ -28,7 +28,13 @@ RUN \ rm $GORELEASER_DOWNLOAD_FILE; # install git-chglog -RUN go get -u github.com/git-chglog/git-chglog/cmd/git-chglog && \ +ARG GIT_CHGLOG_VERSION=0.10.0 +RUN \ + GIT_CHGLOG_DOWNLOAD_FILE=git-chglog_linux_amd64.tar.gz && \ + GIT_CHGLOG_DOWNLOAD_URL=https://github.com/git-chglog/git-chglog/releases/download/v${GIT_CHGLOG_VERSION}/git-chglog_${GIT_CHGLOG_VERSION}_linux_amd64.tar.gz &&\ + wget -O ${GIT_CHGLOG_DOWNLOAD_FILE} ${GIT_CHGLOG_DOWNLOAD_URL}; \ + tar -xzf $GIT_CHGLOG_DOWNLOAD_FILE -C /usr/bin/ git-chglog; \ + rm $GIT_CHGLOG_DOWNLOAD_FILE && \ chmod +x /entrypoint.sh ENTRYPOINT ["bash", "/entrypoint.sh"]