From 44eb513f059a4e8d24cf0680673b047cf55b5712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=93=9D=E4=BA=91Reyes?= Date: Fri, 29 Apr 2022 01:12:07 +0800 Subject: [PATCH] Update docker image build file (#2892) * update docker image building --- .github/workflows/build-and-push-image.yml | 105 +++++++-------------- dockerfiles/Dockerfile-for-frpc | 19 ++-- dockerfiles/Dockerfile-for-frps | 19 ++-- 3 files changed, 58 insertions(+), 85 deletions(-) diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml index d929e58..f089027 100644 --- a/.github/workflows/build-and-push-image.yml +++ b/.github/workflows/build-and-push-image.yml @@ -10,43 +10,9 @@ on: required: true default: 'test' jobs: - binary: - name: Build Golang project - runs-on: ubuntu-latest - steps: - - name: Set up Go 1.x - uses: actions/setup-go@v2 - with: - go-version: 1.18 - - - run: | - # https://github.com/actions/setup-go/issues/107 - cp -f `which go` /usr/bin/go - - - run: go version - - - name: Check out code into the Go module directory - uses: actions/checkout@v2 - - - name: Build - run: make build - - - name: Archive artifacts for frpc - uses: actions/upload-artifact@v1 - with: - name: frpc - path: bin/frpc - - - name: Archive artifacts for frps - uses: actions/upload-artifact@v1 - with: - name: frps - path: bin/frps - image: name: Build Image from Dockerfile and binaries runs-on: ubuntu-latest - needs: binary steps: # environment - name: Checkout @@ -60,19 +26,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - # download binaries of frpc and frps - - name: Download binary of frpc - uses: actions/download-artifact@v2 - with: - name: frpc - path: bin/frpc - - - name: Download binary of frps - uses: actions/download-artifact@v2 - with: - name: frps - path: bin/frps - # get image tag name - name: Get Image Tag Name run: | @@ -81,6 +34,18 @@ jobs: else echo "TAG_NAME=${{ github.event.inputs.tag }}" >> $GITHUB_ENV fi + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Login to the GPR + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} # prepare image tags - name: Prepare Image Tags @@ -92,26 +57,28 @@ jobs: echo "TAG_FRPC_GPR=ghcr.io/fatedier/frpc:${{ env.TAG_NAME }}" >> $GITHUB_ENV echo "TAG_FRPS_GPR=ghcr.io/fatedier/frps:${{ env.TAG_NAME }}" >> $GITHUB_ENV - # build images - - name: Build Images - run: | - # for Docker hub - docker build --file ${{ env.DOCKERFILE_FRPC_PATH }} --tag ${{ env.TAG_FRPC }} . - docker build --file ${{ env.DOCKERFILE_FRPS_PATH }} --tag ${{ env.TAG_FRPS }} . - # for GPR - docker build --file ${{ env.DOCKERFILE_FRPC_PATH }} --tag ${{ env.TAG_FRPC_GPR }} . - docker build --file ${{ env.DOCKERFILE_FRPS_PATH }} --tag ${{ env.TAG_FRPS_GPR }} . + - name: Build and push frpc + uses: docker/build-push-action@v2 + with: + context: . + file: ./dockerfiles/Dockerfile-for-frpc + platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x + push: ${{ github.event_name != 'pull_request' }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache,mode=max + tags: | + ${{ env.TAG_FRPC }} + ${{ env.TAG_FRPC_GPR }} - # push to dockerhub - - name: Publish to Dockerhub - run: | - echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login --username ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin - docker push ${{ env.TAG_FRPC }} - docker push ${{ env.TAG_FRPS }} - - # push to gpr - - name: Publish to GPR - run: | - echo ${{ secrets.GPR_TOKEN }} | docker login ghcr.io --username ${{ github.repository_owner }} --password-stdin - docker push ${{ env.TAG_FRPC_GPR }} - docker push ${{ env.TAG_FRPS_GPR }} + - name: Build and push frps + uses: docker/build-push-action@v2 + with: + context: . + file: ./dockerfiles/Dockerfile-for-frps + platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x + push: ${{ github.event_name != 'pull_request' }} + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache,mode=max + tags: | + ${{ env.TAG_FRPS }} + ${{ env.TAG_FRPS_GPR }} diff --git a/dockerfiles/Dockerfile-for-frpc b/dockerfiles/Dockerfile-for-frpc index fce3d57..b9eb18a 100644 --- a/dockerfiles/Dockerfile-for-frpc +++ b/dockerfiles/Dockerfile-for-frpc @@ -1,14 +1,17 @@ -FROM alpine:3 AS temp +FROM golang:1.18-alpine3.15 AS building -COPY bin/frpc /tmp +COPY . /building +WORKDIR /building -RUN chmod -R 777 /tmp/frpc +RUN apk --no-cache add \ + git \ + && export GO111MODULE=on \ + && env CGO_ENABLED=0 go build -trimpath -ldflags "-s -w" -o ./bin/frpc ./cmd/frpc +FROM alpine:3.15 +LABEL maintainer="i@muir.fun" -FROM alpine:3 - -WORKDIR /app - -COPY --from=temp /tmp/frpc /usr/bin +COPY --from=building /building/bin/frpc /usr/bin/frpc ENTRYPOINT ["/usr/bin/frpc"] +CMD ["-h"] \ No newline at end of file diff --git a/dockerfiles/Dockerfile-for-frps b/dockerfiles/Dockerfile-for-frps index 3d65a9e..d5809e9 100644 --- a/dockerfiles/Dockerfile-for-frps +++ b/dockerfiles/Dockerfile-for-frps @@ -1,14 +1,17 @@ -FROM alpine:3 AS temp +FROM golang:1.18-alpine3.15 AS building -COPY bin/frps /tmp +COPY . /building +WORKDIR /building -RUN chmod -R 777 /tmp/frps +RUN apk --no-cache add \ + git \ + && export GO111MODULE=on \ + && env CGO_ENABLED=0 go build -trimpath -ldflags "-s -w" -o ./bin/frps ./cmd/frps +FROM alpine:3.15 +LABEL maintainer="i@muir.fun" -FROM alpine:3 - -WORKDIR /app - -COPY --from=temp /tmp/frps /usr/bin +COPY --from=building /building/bin/frps /usr/bin/frps ENTRYPOINT ["/usr/bin/frps"] +CMD ["-h"] \ No newline at end of file