use latest alpine from docker hub, update readme

linki · Dec 30, 2016 · a7f2a24 · a7f2a24
1 parent f513a6d
commit a7f2a24
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.opensource.zalan.do/stups/alpine:UPSTREAM
+FROM alpine:latest
 MAINTAINER Team Teapot @ Zalando SE <team-teapot@zalando.de>
 
 # add scm-source

diff --git a/Makefile b/Makefile
@@ -46,11 +46,8 @@ build/linux/$(BINARY): $(SOURCES)
 build/osx/$(BINARY): $(SOURCES)
 	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build $(BUILD_FLAGS) -o build/osx/$(BINARY) -ldflags "$(LDFLAGS)" .
 
-$(DOCKERFILE).upstream: $(DOCKERFILE)
-	sed "s@UPSTREAM@$(shell $(shell head -1 $(DOCKERFILE) | sed -E 's@FROM (.*)/(.*)/(.*):.*@pierone latest \2 \3 --url \1@'))@" $(DOCKERFILE) > $(DOCKERFILE).upstream
-
-build.docker: $(DOCKERFILE).upstream scm-source.json build.linux
-	docker build --rm -t "$(IMAGE):$(TAG)" -f $(DOCKERFILE).upstream .
+build.docker: $(DOCKERFILE) scm-source.json build.linux
+	docker build --rm -t "$(IMAGE):$(TAG)" -f $(DOCKERFILE) .
 
 build.push: build.docker
 	docker push "$(IMAGE):$(TAG)"