@@ -1,6 +1,6 @@
11include .env
22BINARY := oauth2_proxy
3−VERSION := $(shell git describe --always --long --dirty --tags 2>/dev/null || echo "undefined")
3+VERSION := $(shell git describe --always --dirty --tags 2>/dev/null || echo "undefined")
44.NOTPARALLEL:
55
66.PHONY: all
@@ -47,17 +47,31 @@ $(BINARY):
4747
4848.PHONY: docker
4949docker:
50− docker build -f Dockerfile -t pusher/oauth2_proxy:latest .
50+ docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:latest .
5151
5252.PHONY: docker-all
5353docker-all: docker
54− docker build -f Dockerfile -t pusher/oauth2_proxy:latest-amd64 .
55− docker build -f Dockerfile -t pusher/oauth2_proxy:${VERSION} .
56− docker build -f Dockerfile -t pusher/oauth2_proxy:${VERSION}-amd64 .
57− docker build -f Dockerfile.arm64 -t pusher/oauth2_proxy:latest-arm64 .
58− docker build -f Dockerfile.arm64 -t pusher/oauth2_proxy:${VERSION}-arm64 .
59− docker build -f Dockerfile.armv6 -t pusher/oauth2_proxy:latest-armv6 .
60− docker build -f Dockerfile.armv6 -t pusher/oauth2_proxy:${VERSION}-armv6 .
54+ docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:latest-amd64 .
55+ docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:${VERSION} .
56+ docker build -f Dockerfile -t quay.io/pusher/oauth2_proxy:${VERSION}-amd64 .
57+ docker build -f Dockerfile.arm64 -t quay.io/pusher/oauth2_proxy:latest-arm64 .
58+ docker build -f Dockerfile.arm64 -t quay.io/pusher/oauth2_proxy:${VERSION}-arm64 .
59+ docker build -f Dockerfile.armv6 -t quay.io/pusher/oauth2_proxy:latest-armv6 .
60+ docker build -f Dockerfile.armv6 -t quay.io/pusher/oauth2_proxy:${VERSION}-armv6 .
61+
62+.PHONY: docker-push
63+docker-push:
64+ docker push quay.io/pusher/oauth2_proxy:latest
65+
66+.PHONY: docker-push-all
67+docker-push-all: docker-push
68+ docker push quay.io/pusher/oauth2_proxy:latest-amd64
69+ docker push quay.io/pusher/oauth2_proxy:${VERSION}
70+ docker push quay.io/pusher/oauth2_proxy:${VERSION}-amd64
71+ docker push quay.io/pusher/oauth2_proxy:latest-arm64
72+ docker push quay.io/pusher/oauth2_proxy:${VERSION}-arm64
73+ docker push quay.io/pusher/oauth2_proxy:latest-armv6
74+ docker push quay.io/pusher/oauth2_proxy:${VERSION}-armv6
6175
6276.PHONY: test
6377test: dep lint