Skip to content

Commit 9c836f4

Browse files
author
Vladimir Osintsev
committed
Fixes
1 parent 1af721b commit 9c836f4

File tree

3 files changed

+23
-6
lines changed

3 files changed

+23
-6
lines changed

Makefile

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,29 @@
11
ELECTRUM_VERSION = $(strip $(shell cat VERSION))
22

3+
GIT_COMMIT = $(strip $(shell git rev-parse --short HEAD))
4+
35
DOCKER_IMAGE ?= osminogin/electrum-daemon
46
DOCKER_TAG = $(ELECTRUM_VERSION)
57

6-
default: docker_build
8+
# Build Docker image
9+
build: docker_build output
10+
11+
# Build and push Docker image
12+
release: docker_build docker_push output
13+
14+
default: docker_build output
715

816
docker_build:
917
@docker build \
10-
--build-arg VERSION=$(ELECTRUM_VERSION) \
11-
--build-arg VCS_REF=`git rev-parse --short HEAD` \
1218
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
13-
-t $(DOCKER_IMAGE):$(DOCKER_TAG) .
19+
--build-arg VERSION=$(ELECTRUM_VERSION) \
20+
--build-arg VCS_REF=$(GIT_COMMIT) \
21+
-t $(IMAGE_NAME) .
22+
23+
docker_push:
24+
docker tag $(IMAGE_NAME) $(DOCKER_IMAGE):latest
25+
docker push $(IMAGE_NAME)
26+
docker push $(DOCKER_IMAGE):latest
27+
28+
output:
29+
@echo Docker Image: $(DOCKER_IMAGE):$(DOCKER_TAG)

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# docker-electrum-daemon
22

3-
[![](https://img.shields.io/docker/build/osminogin/electrum-daemon.svg)](https://hub.docker.com/r/osminogin/electrum-daemon/builds/) [![](https://img.shields.io/docker/stars/osminogin/electrum-daemon.svg)](https://hub.docker.com/r/osminogin/electrum-daemon) [![](https://images.microbadger.com/badges/image/osminogin/electrum-daemon.svg)](https://microbadger.com/images/osminogin/electrum-daemon) [![License: MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg)](https://opensource.org/licenses/MIT)
3+
[![](https://img.shields.io/docker/build/osminogin/electrum-daemon.svg)](https://hub.docker.com/r/osminogin/electrum-daemon/builds/) [![](https://images.microbadger.com/badges/version/osminogin/electrum-daemon.svg)](https://microbadger.com/images/osminogin/electrum-daemon) [![](https://images.microbadger.com/badges/commit/osminogin/electrum-daemon.svg)](https://microbadger.com/images/osminogin/electrum-daemon) [![](https://img.shields.io/docker/stars/osminogin/electrum-daemon.svg)](https://hub.docker.com/r/osminogin/electrum-daemon) [![](https://images.microbadger.com/badges/image/osminogin/electrum-daemon.svg)](https://microbadger.com/images/osminogin/electrum-daemon) [![License: MIT](https://img.shields.io/badge/License-MIT-lightgrey.svg)](https://opensource.org/licenses/MIT)
4+
45

56
**Electrum client running as a daemon in docker container with JSON-RPC enabled.**
67

hooks/build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
make
3+
make release

0 commit comments

Comments
 (0)