ci: fix incorrect image building
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
FROM golang:1.12-alpine as builder
|
||||
|
||||
FROM golang:1.13-alpine as builder
|
||||
ENV GO111MODULE=on
|
||||
# Remove the cache to avoid warning message during `apk info`
|
||||
RUN rm -rf /var/cache/apk/* && \
|
||||
rm -rf /tmp/*
|
||||
@@ -9,10 +9,9 @@ RUN apk update
|
||||
# GO and PATH env variables already set in golang image
|
||||
# to reduce download time
|
||||
RUN apk --no-cache add -U make git musl-dev gcc
|
||||
|
||||
WORKDIR /app
|
||||
COPY . .
|
||||
|
||||
RUN GO111MODULE=on make local-build
|
||||
RUN make local-build
|
||||
|
||||
# final stage
|
||||
FROM alpine:3.7
|
||||
|
||||
4
Makefile
4
Makefile
@@ -35,7 +35,7 @@ clean: local-clean ## Clean your generated files
|
||||
.PHONY: local-build
|
||||
local-build: local-clean local-format ## Build locally the binary
|
||||
@echo "+ $@"
|
||||
GO111MODULE=on go build -o $(GO)/bin/$(BIN_NAME) .
|
||||
go build -o $(GO)/bin/$(BIN_NAME) .
|
||||
|
||||
.PHONY: local-clean
|
||||
local-clean: ## Cleanup locally any build binaries or packages
|
||||
@@ -100,6 +100,6 @@ bdd-test: local-run-app
|
||||
go get github.com/DATA-DOG/godog/cmd/godog
|
||||
DB_PORT=`docker-compose -p $(DOCKER_IMAGE_NAME)-uuid -f containers/docker-compose.yml port database 5432 | cut -f2 -d':'`;
|
||||
API_PORT=`docker-compose -p $(DOCKER_IMAGE_NAME)-uuid -f containers/docker-compose.yml port api 8080 | cut -f2 -d':'`;
|
||||
$GOPATH/bin/godog
|
||||
$(GOPATH)/bin/godog
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user