diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index e8ecb70..fb5c77e 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -1,17 +1,25 @@ on: push: branches: - - master + - 'master' + paths-ignore: + - '**.md' + - 'docs' + tags: + - 'v*.*.*' pull_request: branches: - - master + - 'master' + paths-ignore: + - '**.md' + - 'docs' name: docker-build jobs: build: runs-on: ubuntu-latest steps: - name: Checkout the code - uses: actions/checkout@v1 + uses: actions/checkout@v2 - name: Dockerhub login env: @@ -35,14 +43,21 @@ jobs: id: buildx uses: crazy-max/ghaction-docker-buildx@v1 with: - version: latest + buildx-version: latest + qemu-version: latest - name: Build and push docker image - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} run: | docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \ --output "type=image,push=true" \ --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \ --tag "${{ steps.prepare.outputs.docker_image }}:latest" \ - --file Dockerfile . \ No newline at end of file + --file Dockerfile . + + test: + needs: build + runs-on: ubuntu-latest + steps: + - name: Test docker image + run: | + docker run --rm --entrypoint /bin/sh ${{ secrets.DOCKER_USERNAME }}/trojan-go trojan-go --version \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index e82dfbe..e23e8a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN apk add --update git &&\ FROM alpine WORKDIR / COPY --from=builder /trojan-go/release /usr/local/bin/ -COPY example/server.json /etc/ +COPY example/server.json /etc/trojan-go/ ENTRYPOINT ["/usr/local/bin/trojan-go", "-config"] -CMD ["/etc/server.json"] \ No newline at end of file +CMD ["/etc/trojan-go/server.json"] \ No newline at end of file