kratisto/hamster-tycoon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: fix incorrect image building

Browse Source
This commit is contained in:
Jeffrey Duroyon
2019-09-20 00:35:38 +02:00
parent 326a461e44
commit ced985da52
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@@ -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` # Remove the cache to avoid warning message during `apk info`
RUN rm -rf /var/cache/apk/* && \ RUN rm -rf /var/cache/apk/* && \
rm -rf /tmp/* rm -rf /tmp/*
@@ -9,10 +9,9 @@ RUN apk update
# GO and PATH env variables already set in golang image # GO and PATH env variables already set in golang image
# to reduce download time # to reduce download time
RUN apk --no-cache add -U make git musl-dev gcc RUN apk --no-cache add -U make git musl-dev gcc
WORKDIR /app
COPY . . COPY . .
RUN make local-build
RUN GO111MODULE=on make local-build
# final stage # final stage
FROM alpine:3.7 FROM alpine:3.7

4
Makefile
View File

@@ -35,7 +35,7 @@ clean: local-clean ## Clean your generated files
.PHONY: local-build .PHONY: local-build
local-build: local-clean local-format ## Build locally the binary local-build: local-clean local-format ## Build locally the binary
@echo "+ $@" @echo "+ $@"
GO111MODULE=on go build -o $(GO)/bin/$(BIN_NAME) . go build -o $(GO)/bin/$(BIN_NAME) .
.PHONY: local-clean .PHONY: local-clean
local-clean: ## Cleanup locally any build binaries or packages 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 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':'`; 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':'`; 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