Skip to content

Commit 2605218

Browse files
committed
Improve Makefile
+ Remove duplication + Add `all` target + Reference a fixed version of the gcloud SDK image Signed-off-by: David Gageot <[email protected]>
1 parent 1d95343 commit 2605218

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

gcp/Makefile

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,23 @@
11
# Copyright 2016 Docker Inc. All rights reserved.
22

3-
auth:
4-
docker run -it --name gcloud-config google/cloud-sdk gcloud init
3+
GCLOUD_IMAGE_TAG = sha256:3a4e572df0c716196b3ffdeacaba3ebdd36f8cdfdac6d5ee4bd50cd405366736
4+
GCLOUD = docker run --rm -ti -v $(CURDIR)/configuration:/configuration --volumes-from gcloud-config google/cloud-sdk gcloud
5+
DEPLOYMENTS = $(GCLOUD) deployment-manager deployments
6+
7+
all: auth create
8+
9+
auth: revoke
10+
docker run -it --name gcloud-config google/cloud-sdk@$(GCLOUD_IMAGE_TAG) true
11+
$(GCLOUD) init
512

613
revoke:
7-
docker rm -f gcloud-config
14+
docker rm gcloud-config || true
815

916
create:
10-
docker run --rm -ti -v $(CURDIR)/configuration:/configuration --volumes-from gcloud-config google/cloud-sdk gcloud deployment-manager deployments create docker --config configuration/docker.yaml
17+
$(DEPLOYMENTS) create docker --config configuration/docker.yaml
1118

1219
describe:
13-
docker run --rm -ti -v $(CURDIR)/configuration:/configuration --volumes-from gcloud-config google/cloud-sdk gcloud deployment-manager deployments describe docker
20+
$(DEPLOYMENTS) describe docker
1421

1522
delete:
16-
docker run --rm -ti -v $(CURDIR)/configuration:/configuration --volumes-from gcloud-config google/cloud-sdk gcloud deployment-manager deployments delete docker -q
23+
$(DEPLOYMENTS) delete docker -q

0 commit comments

Comments
 (0)