From 42296cb88df736bbe017baa0b93a7355dca052e2 Mon Sep 17 00:00:00 2001 From: decima Date: Mon, 29 Mar 2021 23:00:00 +0200 Subject: [PATCH 1/4] fix test --- .dockerignore | 1 + .github/workflows/go.yml | 25 ++++++++++++++++++++++--- Dockerfile | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..1d1fe94 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +Dockerfile \ No newline at end of file diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index ed8df90..d1b536c 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -2,9 +2,9 @@ name: Go on: push: - branches: [ master ] + branches: [ master,dockerize ] pull_request: - branches: [ master ] + branches: [ master,dockerize ] jobs: build: @@ -43,4 +43,23 @@ jobs: uses: coverallsapp/github-action@v1.1.2 with: github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: coverage.lcov \ No newline at end of file + path-to-lcov: coverage.lcov + + publish: + runs-on: ubuntu-latest + steps: + - name: Build and push Docker images + uses: docker/build-push-action@v2.3.0 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: gogems/jet:latest + - name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a9e52d5 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +FROM golang:1.16-alpine as BUILD +RUN apk --update upgrade \ + && apk --no-cache --no-progress add git bash gcc curl tar ca-certificates \ + && update-ca-certificates \ + && rm -rf /var/cache/apk/* +WORKDIR /go/src/github.com/go-gems/jet + +COPY go.mod . +COPY go.sum . +RUN GO111MODULE=on GOPROXY=https://proxy.golang.org go mod download + +COPY . /go/src/github.com/go-gems/jet +RUN go build -o jet . + +FROM alpine as RUN +COPY --from=BUILD /go/src/github.com/go-gems/jet/jet /usr/local/bin/jet +RUN chmod 777 /usr/local/bin/jet +EXPOSE 8000 +ENTRYPOINT ["jet"] + + From abe18df5c815fc590e6d950e7df90c6a49e9d6aa Mon Sep 17 00:00:00 2001 From: decima Date: Mon, 29 Mar 2021 23:00:37 +0200 Subject: [PATCH 2/4] fix test --- .github/workflows/go.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index d1b536c..48f7dcf 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -49,6 +49,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Build and push Docker images + if: success() uses: docker/build-push-action@v2.3.0 - name: Login to DockerHub uses: docker/login-action@v1 From cfa1c5a2952b147a29e74c228cdd766794e5b9ea Mon Sep 17 00:00:00 2001 From: decima Date: Mon, 29 Mar 2021 23:03:39 +0200 Subject: [PATCH 3/4] fix test --- .github/workflows/go.yml | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 48f7dcf..7efaee2 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -22,7 +22,22 @@ jobs: - name: Test run: go test -v -tags skip ./... - + - name: Build and push Docker images + if: success() + uses: docker/build-push-action@v2.3.0 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: gogems/jet:latest + - name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} coverage: runs-on: ubuntu-latest steps: @@ -44,23 +59,3 @@ jobs: with: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: coverage.lcov - - publish: - runs-on: ubuntu-latest - steps: - - name: Build and push Docker images - if: success() - uses: docker/build-push-action@v2.3.0 - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - id: docker_build - uses: docker/build-push-action@v2 - with: - push: true - tags: gogems/jet:latest - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file From b636e153394a6377dd6c9e6018bfb18e4f2bd31e Mon Sep 17 00:00:00 2001 From: decima Date: Tue, 30 Mar 2021 11:10:05 +0200 Subject: [PATCH 4/4] fix test --- .github/workflows/go.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 7efaee2..98ece58 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -2,9 +2,9 @@ name: Go on: push: - branches: [ master,dockerize ] + branches: [ master ] pull_request: - branches: [ master,dockerize ] + branches: [ master ] jobs: build: