Merge pull request #54 from SatoshiPortal/dev

Docker image tags management
This commit is contained in:
kexkey
2019-01-22 13:18:50 -05:00
committed by GitHub
2 changed files with 31 additions and 17 deletions

View File

@@ -2,16 +2,16 @@
TRACING=1
# CYPHERNODE VERSION "v0.1"
CONF_VERSION="v0.1"
GATEKEEPER_VERSION="v0.1"
PROXY_VERSION="v0.1"
PROXYCRON_VERSION="v0.1"
OTSCLIENT_VERSION="v0.1"
PYCOIN_VERSION="v0.1"
# CYPHERNODE VERSION "v0.1.1"
CONF_VERSION="v0.1.1-local"
GATEKEEPER_VERSION="v0.1.1-local"
PROXY_VERSION="v0.1.1-local"
PROXYCRON_VERSION="v0.1.1-local"
OTSCLIENT_VERSION="v0.1.1-local"
PYCOIN_VERSION="v0.1.1-local"
BITCOIN_VERSION="v0.17.0"
LIGHTNING_VERSION="v0.6.2"
GRAFANA_VERSION="v0.1"
GRAFANA_VERSION="v0.1.1-local"
trace()
{
@@ -64,8 +64,8 @@ build_docker_images() {
build_docker_image install/ cyphernode/cyphernodeconf:$CONF_VERSION
trace "Creating SatoshiPortal images"
build_docker_image install/SatoshiPortal/dockers/bitcoin-core cyphernode/bitcoin:$BITCOIN_VERSION $bitcoin_dockerfile
build_docker_image install/SatoshiPortal/dockers/c-lightning cyphernode/clightning:$LIGHTNING_VERSION $clightning_dockerfile
# build_docker_image install/SatoshiPortal/dockers/bitcoin-core cyphernode/bitcoin:$BITCOIN_VERSION $bitcoin_dockerfile
# build_docker_image install/SatoshiPortal/dockers/c-lightning cyphernode/clightning:$LIGHTNING_VERSION $clightning_dockerfile
trace "Creating cyphernode images"
build_docker_image api_auth_docker/ cyphernode/gatekeeper:$GATEKEEPER_VERSION

28
dist/setup.sh vendored
View File

@@ -649,14 +649,14 @@ ALWAYSYES=0
SUDO_REQUIRED=0
AUTOSTART=0
# CYPHERNODE VERSION "v0.1.0"
# CYPHERNODE VERSION "v0.1.1"
VERSION_OVERRIDE="true"
CONF_VERSION="v0.1"
GATEKEEPER_VERSION="v0.1"
PROXY_VERSION="v0.1"
PROXYCRON_VERSION="v0.1"
OTSCLIENT_VERSION="v0.1"
PYCOIN_VERSION="v0.1"
CONF_VERSION="v0.1.1"
GATEKEEPER_VERSION="v0.1.1"
PROXY_VERSION="v0.1.1"
PROXYCRON_VERSION="v0.1.1"
OTSCLIENT_VERSION="v0.1.1"
PYCOIN_VERSION="v0.1.1"
BITCOIN_VERSION="v0.17.0"
LIGHTNING_VERSION="v0.6.2"
@@ -703,6 +703,20 @@ while getopts ":cirhys" opt; do
esac
done
nbbuiltimgs=$(docker images --filter=reference='cyphernode/*:*-local' | wc -l)
if [[ $nbbuiltimgs -gt 1 ]]; then
read -p "Locally built Cyphernode images found! Do you want to use them?" -n 1 -r
if [[ $REPLY =~ ^[Yy]$ ]]; then
CONF_VERSION="$CONF_VERSION-local"
GATEKEEPER_VERSION="$GATEKEEPER_VERSION-local"
PROXY_VERSION="$PROXY_VERSION-local"
PROXYCRON_VERSION="$PROXYCRON_VERSION-local"
OTSCLIENT_VERSION="$OTSCLIENT_VERSION-local"
PYCOIN_VERSION="$PYCOIN_VERSION-local"
fi
fi
if [[ $CONFIGURE == 0 && $INSTALL == 0 && $RECREATE == 0 ]]; then
CONFIGURE=1
INSTALL=1