From 845cac2d5a40ad966b02c30857675a0b97160274 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Sat, 17 Oct 2020 20:57:26 +0100 Subject: [PATCH] Added dockerfile --- Dockerfile | 22 +++++++++++++++++++++ Makefile | 56 +++++++++++++++++++++++------------------------------- 2 files changed, 46 insertions(+), 32 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..47b2ce8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.14-alpine as builder + +ARG TARGETPLATFORM +ARG BUILDPLATFORM +ARG TARGETOS +ARG TARGETARCH + +WORKDIR /app/ +RUN apk update && apk add --no-cache git && adduser -D -g '' gopher && apk add -U --no-cache ca-certificates +ADD go.mod go.sum ./ +RUN go mod download +ADD . . +RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-w -s" -o gopherss . + +FROM --platform=${TARGETPLATFORM:-linux/amd64} scratch +WORKDIR /app/ +COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ +COPY --from=builder /etc/passwd /etc/passwd +COPY --from=builder /app/gopherss /app/gopherss +COPY ./web /app/web/ +USER gopher +ENTRYPOINT ["/app/gopherss"] diff --git a/Makefile b/Makefile index 9c7aa51..eaee4d2 100644 --- a/Makefile +++ b/Makefile @@ -1,65 +1,57 @@ .DEFAULT_GOAL := default -IMAGE ?= docker.cloud.cluster.fun/private/${REPO_NAME_LOWER}:latest +IMAGE ?= docker.cluster.fun/averagemarcus/gopherss:latest +PLATFORMS ?= linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 + +export DOCKER_CLI_EXPERIMENTAL=enabled .PHONY: test # Run all tests, linting and format checks test: lint check-format run-tests .PHONY: lint # Perform lint checks against code lint: - @echo "⚠️ 'lint' unimplemented" - # GO Projects - # @go vet && golint -set_exit_status ./... + @go vet && golint -set_exit_status ./... .PHONY: check-format # Checks code formatting and returns a non-zero exit code if formatting errors found check-format: - @echo "⚠️ 'check-format' unimplemented" - # GO Projects - # @gofmt -e -l . + @gofmt -e -l . .PHONY: format # Performs automatic format fixes on all code format: - @echo "⚠️ 'format' unimplemented" - # GO Projects - # @gofmt -s -w . + @gofmt -s -w . .PHONY: run-tests # Runs all tests run-tests: - @echo "⚠️ 'run-tests' unimplemented" - # GO Projects - # @go test - # Node Projects - # @npm test + @go test .PHONY: fetch-deps # Fetch all project dependencies fetch-deps: - @echo "⚠️ 'fetch-deps' unimplemented" - # GO Projects - # @go mod tidy - # Node Projects - # @npm install + @go mod tidy .PHONY: build # Build the project build: lint check-format fetch-deps - @echo "⚠️ 'build' unimplemented" - # GO Projects - # @go build -o ${PROJECT_NAME} main.go + @go build -o gopherss . .PHONY: docker-build # Build the docker image docker-build: - @docker build -t $(IMAGE) . + @docker buildx create --use --name=crossplat --node=crossplat && \ + docker buildx build \ + --output "type=docker,push=false" \ + --tag $(IMAGE) \ + . .PHONY: docker-publish # Push the docker image to the remote registry docker-publish: - @docker push $(IMAGE) + @docker buildx create --use --name=crossplat --node=crossplat && \ + docker buildx build \ + --platform $(PLATFORMS) \ + --output "type=image,push=true" \ + --tag $(IMAGE) \ + . .PHONY: run # Run the application run: - @echo "⚠️ 'run' unimplemented" - # GO Projects - # @go run main.go - # Node Projects - # @npm start + @go run . .PHONY: ci # Perform CI specific tasks to perform on a pull request ci: @@ -67,11 +59,11 @@ ci: .PHONY: release # Release the latest version of the application release: - @echo "⚠️ 'release' unimplemented" + @echo "⚠️ 'released' unimplemented" .PHONY: help # Show this list of commands help: - @echo "Gopherss" + @echo "gopherss" @echo "Usage: make [target]" @echo "" @echo "target description" | expand -t20