From 382d9ff5bea2cb140b1b3ebb29e2dbe9d4a34330 Mon Sep 17 00:00:00 2001 From: jash Date: Sat, 13 Oct 2018 22:08:50 +0200 Subject: [PATCH] adde devregistry support --- .../generators/app/index.js | 3 ++- .../installer/docker/docker-compose.yaml | 10 +++++----- publish.sh | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100755 publish.sh diff --git a/install/generator-cyphernode/generators/app/index.js b/install/generator-cyphernode/generators/app/index.js index 5cd4308..3dce914 100644 --- a/install/generator-cyphernode/generators/app/index.js +++ b/install/generator-cyphernode/generators/app/index.js @@ -78,7 +78,8 @@ module.exports = class extends Generator { this.props = { 'derivation_path': '0/n', 'installer': 'docker', - 'devmode': false + 'devmode': false, + 'devregistry': false }; } diff --git a/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml b/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml index 3cccc57..5e9350e 100644 --- a/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml +++ b/install/generator-cyphernode/generators/app/templates/installer/docker/docker-compose.yaml @@ -20,7 +20,7 @@ services: - "DERIVATION_PUB32=<%= xpub %>" - "DERIVATION_PATH=<%= derivation_path %>" - "WATCHER_BTC_NODE_PRUNED=<%= bitcoin_prune?'true':'false' %>" - image: cyphernode/proxy + image: <%= devregistry?'registry.skp.rocks:5000/$ARCH/':'' %>cyphernode/proxy <% if ( devmode ) { %> ports: - "8888:8888" @@ -37,7 +37,7 @@ services: proxycron: environment: - "PROXY_URL=proxy:8888/executecallbacks" - image: cyphernode/proxycron + image: <%= devregistry?'registry.skp.rocks:5000/$ARCH/':'' %>cyphernode/proxycron # deploy: # placement: # constraints: [node.hostname==dev] @@ -47,7 +47,7 @@ services: pycoin: # Pycoin command: $USER ./startpycoin.sh - image: cyphernode/pycoin + image: <%= devregistry?'registry.skp.rocks:5000/$ARCH/':'' %>cyphernode/pycoin environment: - "TRACING=1" - "PYCOIN_LISTENING_PORT=7777" @@ -64,7 +64,7 @@ services: <% if ( features.indexOf('lightning') !== -1 && lightning_implementation === 'c-lightning' ) { %> lightning: command: $USER lightningd - image: cyphernode/clightning + image: <%= devregistry?'registry.skp.rocks:5000/$ARCH/':'' %>cyphernode/clightning ports: - "9735:9735" volumes: @@ -79,7 +79,7 @@ services: <% if( bitcoin_mode === 'internal' ) { %> bitcoin: command: $USER bitcoind - image: cyphernode/bitcoin + image: <%= devregistry?'registry.skp.rocks:5000/$ARCH/':'' %>cyphernode/bitcoin <% if( bitcoin_expose ) { %> ports: - "<%= (net === 'mainnet')?'8332:8332':'18332:18332' %>" diff --git a/publish.sh b/publish.sh new file mode 100755 index 0000000..95f8038 --- /dev/null +++ b/publish.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +ARCH=$(uname -m) + +docker tag cyphernodeconf registry.skp.rocks:5000/$ARCH/cyphernodeconf +docker tag cyphernode/bitcoin registry.skp.rocks:5000/$ARCH/cyphernode/bitcoin +docker tag cyphernode/clightning registry.skp.rocks:5000/$ARCH/cyphernode/clightning +docker tag cyphernode/otsclient registry.skp.rocks:5000/$ARCH/cyphernode/otsclient +docker tag cyphernode/proxy registry.skp.rocks:5000/$ARCH/cyphernode/proxy +docker tag cyphernode/proxycron registry.skp.rocks:5000/$ARCH/cyphernode/proxycron +docker tag cyphernode/pycoin registry.skp.rocks:5000/$ARCH/cyphernode/pycoin + +docker push registry.skp.rocks:5000/$ARCH/cyphernodeconf +docker push registry.skp.rocks:5000/$ARCH/cyphernode/bitcoin +docker push registry.skp.rocks:5000/$ARCH/cyphernode/clightning +docker push registry.skp.rocks:5000/$ARCH/cyphernode/otsclient +docker push registry.skp.rocks:5000/$ARCH/cyphernode/proxy +docker push registry.skp.rocks:5000/$ARCH/cyphernode/proxycron +docker push registry.skp.rocks:5000/$ARCH/cyphernode/pycoin