From 3d38d8fd058054cb97441ad5d269dd365c63dfdc Mon Sep 17 00:00:00 2001 From: Erkan Zileli Date: Wed, 15 Sep 2021 11:41:09 +0300 Subject: [PATCH] fix: add go 1.17.x to the matrix, remove dockerfile (#14) Signed-off-by: Erkan Zileli --- .github/workflows/test.yml | 2 +- Dockerfile | 29 ----------------------------- Makefile | 12 ------------ 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 Dockerfile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 46feb10..7aec3b2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: Build: strategy: matrix: - go-version: [1.16.x] + go-version: [1.16.x, 1.17.x] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} steps: diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index f9b95fd..0000000 --- a/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM registry.trendyol.com/platform/base/image/golang:1.16.0-alpine3.13 as build - -WORKDIR /kink-workspace - -RUN apk add --no-cache git make - -ENV CGO_ENABLED=0 \ - GO111MODULE=on \ - GOOS=linux \ - GOARCH=amd64 - -COPY go.mod go.sum ./ - -RUN go mod download - -COPY ./ ./ - -RUN make cosign - -FROM gcr.io/distroless/static:nonroot-amd64 - -WORKDIR /kink-workspace - -COPY --from=build --chown=nonroot:nonroot /kink-workspace/kink /usr/local/bin/kink - -USER nonroot -ENTRYPOINT ["kink"] - - diff --git a/Makefile b/Makefile index f20db50..27b8d2c 100644 --- a/Makefile +++ b/Makefile @@ -41,15 +41,3 @@ release: export DOCKER_USERNAME=$(DOCKER_USERNAME) && \ export DOCKER_PASSWORD=$(DOCKER_PASSWORD) && \ LDFLAGS=$(LDFLAGS) goreleaser release --rm-dist - -release-local: - docker container run --rm --privileged \ - -v $(shell pwd):/kink \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -w /kink \ - --entrypoint='/bin/sh' \ - -e GITLAB_TOKEN=$(GITLAB_TOKEN) \ - -e DOCKER_REGISTRY=$(DOCKER_REGISTRY) \ - -e DOCKER_USERNAME=$(DOCKER_USERNAME) \ - -e DOCKER_PASSWORD=$(DOCKER_PASSWORD) \ - registry.trendyol.com/platform/base/image/gythialy/golang-cross:v1.17 -c "make release"