Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Garret Picchioni 2019-03-27 11:12:22 -07:00
commit cdc634cb32
No known key found for this signature in database
GPG Key ID: AFB3DB1A44B980C2
4 changed files with 25 additions and 15 deletions

View File

@ -1,15 +1,15 @@
language: go
language: minimal
go:
- stable
services:
- docker
# Go module behaviour is disabled by default for packages inside GOPATH.
# Turn module support on explicitly:
env:
- GO111MODULE=on
script:
- make docker-build
deploy:
provider: heroku
app: ifconfig-co
api_key:
secure: IQG/ls5Zu0yua5Ynn5EL9JCPjo1/WcmS0z7BSaXWdgW+JIWFm7oF5z54bUZHl/q1tTuWzAJk59zSTYJijtQqh2Ssl3fLu3uFDwyJSrOuUu1akPlETam8NpdbH4lPkFp75JSDdDXV08c0APmeLL6gqRuTrUuufu69Wigjq4gLo+o=
- provider: script
script: make docker-push
- provider: heroku
app: ifconfig-co
api_key:
secure: IQG/ls5Zu0yua5Ynn5EL9JCPjo1/WcmS0z7BSaXWdgW+JIWFm7oF5z54bUZHl/q1tTuWzAJk59zSTYJijtQqh2Ssl3fLu3uFDwyJSrOuUu1akPlETam8NpdbH4lPkFp75JSDdDXV08c0APmeLL6gqRuTrUuufu69Wigjq4gLo+o=

View File

@ -1,9 +1,9 @@
# Build
FROM golang:1.11-stretch AS build
FROM golang:1.12-stretch AS build
WORKDIR /go/src/github.com/mpolden/echoip
COPY . .
ENV GO111MODULE=on CGO_ENABLED=0
RUN go install ./...
ENV GO111MODULE=on
RUN make
# Run
FROM scratch

View File

@ -1,3 +1,4 @@
DOCKER_IMAGE := mpolden/echoip
OS := $(shell uname)
ifeq ($(OS),Linux)
TAR_OPTS := --wildcards
@ -31,3 +32,12 @@ $(databases):
test ! -f data/GeoLite2-Country.mmdb || mv data/GeoLite2-Country.mmdb data/country.mmdb
geoip-download: $(databases)
docker-build:
docker build -t $(DOCKER_IMAGE) .
docker-login:
@echo "$(DOCKER_PASSWORD)" | docker login -u "$(DOCKER_USERNAME)" --password-stdin
docker-push: docker-login
docker push $(DOCKER_IMAGE)

2
go.mod
View File

@ -1,5 +1,5 @@
// +heroku install ./...
// +heroku goVersion go1.11
// +heroku goVersion go1.12
module github.com/mpolden/echoip
require (