From 64c60ab86c257189977e7c5c6491708589700380 Mon Sep 17 00:00:00 2001 From: Vladimir Osintsev Date: Fri, 3 Apr 2020 17:02:37 +0300 Subject: [PATCH] New makefile targer for image tagging --- Makefile | 8 +++++--- contrib/electrum.service | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e0242eb..5f992ed 100644 --- a/Makefile +++ b/Makefile @@ -5,10 +5,10 @@ DOCKER_IMAGE ?= osminogin/electrum-daemon DOCKER_TAG = $(ELECTRUM_VERSION) # Build Docker image -build: docker_build output +build: docker_build docker_tag output # Build and push Docker image -release: docker_build docker_push output +release: docker_tag docker_push output default: docker_build output @@ -19,8 +19,10 @@ docker_build: --build-arg VCS_REF=$(GIT_COMMIT) \ -t $(DOCKER_IMAGE):$(DOCKER_TAG) . -docker_push: +docker_tag: docker tag $(DOCKER_IMAGE):$(DOCKER_TAG) $(DOCKER_IMAGE):latest + +docker_push: docker push $(DOCKER_IMAGE):latest docker push $(DOCKER_IMAGE):$(DOCKER_TAG) diff --git a/contrib/electrum.service b/contrib/electrum.service index f4068b0..307f5b1 100644 --- a/contrib/electrum.service +++ b/contrib/electrum.service @@ -8,9 +8,9 @@ After=docker.service network.target TimeoutStartSec=5 Restart=always RestartSec=20s -ExecStartPre=/usr/bin/docker pull osminogin/tor-simple -ExecStart=/usr/bin/docker run --rm --name tor -p 127.0.0.1:9050:9050 osminogin/tor-simple -ExecStop=/usr/bin/docker stop tor +ExecStartPre=/usr/bin/docker pull osminogin/electrum-daemon +ExecStart=/usr/bin/docker run --rm --name electrum -p 127.0.0.1:9000:9000 osminogin/electrum-daemon +ExecStop=/usr/bin/docker stop electrum [Install] WantedBy=multi-user.target