New makefile targer for image tagging

osminogin · Apr 3, 2020 · 64c60ab · 64c60ab
1 parent 95725b8
commit 64c60ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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
@@ -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