diff --git a/Dockerfile b/Dockerfile index 22ec8b2e..99a7b7d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM hunterlong/statup:base +FROM hunterlong/statup:base-v0.48 MAINTAINER "Hunter Long (https://github.com/hunterlong)" # Locked version of Statup for 'latest' Docker tag diff --git a/Makefile b/Makefile index e489ff94..3451f5e9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=0.47 +VERSION=0.48 BINARY_NAME=statup GOPATH:=$(GOPATH) GOCMD=go @@ -69,14 +69,20 @@ docker: docker-run: docker docker run -it -p 8080:8080 hunterlong/statup:latest -docker-dev: clean +docker-dev: clean docker-base docker build -t hunterlong/statup:dev -f dev/Dockerfile-dev . docker-push-dev: docker-base docker-dev docker-cypress docker push hunterlong/statup:dev + docker tag hunterlong/statup:base hunterlong/statup:base-v$(VERSION) docker push hunterlong/statup:base docker push hunterlong/statup:cypress +docker-push-base: + docker tag hunterlong/statup:base hunterlong/statup:base-v$(VERSION) + docker push hunterlong/statup:base + docker push hunterlong/statup:base-v$(VERSION) + docker-push-latest: docker docker push hunterlong/statup:latest @@ -97,7 +103,11 @@ docker-base: clean docker build -t hunterlong/statup:base -f dev/Dockerfile-base . docker-build-base: - docker build -t hunterlong/statup:base -f dev/Dockerfile-base . + docker build -t hunterlong/statup:base --no-cache -f dev/Dockerfile-base . + docker tag hunterlong/statup:base hunterlong/statup:base-v$(VERSION) + +docker-build-latest: + docker build -t hunterlong/statup:latest --no-cache -f Dockerfile . databases: docker run --name statup_postgres -p 5432:5432 -e POSTGRES_PASSWORD=password123 -e POSTGRES_USER=root -e POSTGRES_DB=root -d postgres diff --git a/dev/Dockerfile-base b/dev/Dockerfile-base index e0b8d6d3..92a83d91 100644 --- a/dev/Dockerfile-base +++ b/dev/Dockerfile-base @@ -1,5 +1,6 @@ -FROM scratch +FROM alpine:latest MAINTAINER "Hunter Long (https://github.com/hunterlong)" +RUN apk --no-cache add libstdc++ ca-certificates WORKDIR /app ADD sass /usr/local/bin/ ADD ./build/alpine-linux-amd64 /usr/local/bin/statup \ No newline at end of file