From b7fd0a1b7e2531cb966d3c683b5734ebc5f65dcb Mon Sep 17 00:00:00 2001
From: Joel Speed <Joel.speed@hotmail.co.uk>
Date: Fri, 8 Feb 2019 10:05:57 +0000
Subject: [PATCH 1/2] Add push target to Makefile
---
Makefile | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index a5c4514b..2decd016 100644
--- a/Makefile
+++ b/Makefile
@@ -47,17 +47,31 @@ $(BINARY):
.PHONY: docker
docker:
- docker build -f Dockerfile -t pusher/oauth2_proxy:latest .
+ docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:latest .
.PHONY: docker-all
docker-all: docker
- docker build -f Dockerfile -t pusher/oauth2_proxy:latest-amd64 .
- docker build -f Dockerfile -t pusher/oauth2_proxy:${VERSION} .
- docker build -f Dockerfile -t pusher/oauth2_proxy:${VERSION}-amd64 .
- docker build -f Dockerfile.arm64 -t pusher/oauth2_proxy:latest-arm64 .
- docker build -f Dockerfile.arm64 -t pusher/oauth2_proxy:${VERSION}-arm64 .
- docker build -f Dockerfile.armv6 -t pusher/oauth2_proxy:latest-armv6 .
- docker build -f Dockerfile.armv6 -t pusher/oauth2_proxy:${VERSION}-armv6 .
+ docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:latest-amd64 .
+ docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:${VERSION} .
+ docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:${VERSION}-amd64 .
+ docker build -f Dockerfile.arm64 -t quay.io/pusher/oauth2_proxy:latest-arm64 .
+ docker build -f Dockerfile.arm64 -t quay.io/pusher/oauth2_proxy:${VERSION}-arm64 .
+ docker build -f Dockerfile.armv6 -t quay.io/pusher/oauth2_proxy:latest-armv6 .
+ docker build -f Dockerfile.armv6 -t quay.io/pusher/oauth2_proxy:${VERSION}-armv6 .
+
+.PHONY: docker-push
+docker-push:
+ docker push quay.io/pusher/oauth2_proxy:latest
+
+.PHONY: docker-push-all
+docker-push-all: docker-push
+ docker push quay.io/pusher/oauth2_proxy:latest-amd64
+ docker push quay.io/pusher/oauth2_proxy:${VERSION}
+ docker push quay.io/pusher/oauth2_proxy:${VERSION}-amd64
+ docker push quay.io/pusher/oauth2_proxy:latest-arm64
+ docker push quay.io/pusher/oauth2_proxy:${VERSION}-arm64
+ docker push quay.io/pusher/oauth2_proxy:latest-armv6
+ docker push quay.io/pusher/oauth2_proxy:${VERSION}-armv6
.PHONY: test
test: dep lint
From bdf68cc5f09280e747cad6a8b59c927fd7afbbd5 Mon Sep 17 00:00:00 2001
From: Joel Speed <Joel.speed@hotmail.co.uk>
Date: Fri, 8 Feb 2019 10:10:52 +0000
Subject: [PATCH 2/2] Remove --long from git describe
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 2decd016..1c62d9c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
include .env
BINARY := oauth2_proxy
-VERSION := $(shell git describe --always --long --dirty --tags 2>/dev/null || echo "undefined")
+VERSION := $(shell git describe --always --dirty --tags 2>/dev/null || echo "undefined")
.NOTPARALLEL:
.PHONY: all