Skip to content

Commit

Permalink
Fixes
Browse files Browse the repository at this point in the history
Vladimir Osintsev committed Jan 22, 2018
1 parent 1af721b commit 20e5378
Showing 3 changed files with 23 additions and 6 deletions.
24 changes: 20 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
ELECTRUM_VERSION = $(strip $(shell cat VERSION))

GIT_COMMIT = $(strip $(shell git rev-parse --short HEAD))

DOCKER_IMAGE ?= osminogin/electrum-daemon
DOCKER_TAG = $(ELECTRUM_VERSION)

default: docker_build
# Build Docker image
build: docker_build output

# Build and push Docker image
release: docker_build docker_push output

default: docker_build output

docker_build:
@docker build \
--build-arg VERSION=$(ELECTRUM_VERSION) \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-t $(DOCKER_IMAGE):$(DOCKER_TAG) .
--build-arg VERSION=$(ELECTRUM_VERSION) \
--build-arg VCS_REF=$(GIT_COMMIT) \
-t $(IMAGE_NAME) .

docker_push:
docker tag $(IMAGE_NAME) $(DOCKER_IMAGE):latest
docker push $(IMAGE_NAME)
docker push $(DOCKER_IMAGE):latest

output:
@echo Docker Image: $(DOCKER_IMAGE):$(DOCKER_TAG)
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# docker-electrum-daemon

[![](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)
[![](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)


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

2 changes: 1 addition & 1 deletion hooks/build
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

make
make release

0 comments on commit 20e5378

Please sign in to comment.