From b64114d5d2ceee5d4e3dc10cbaef7541db5a5e73 Mon Sep 17 00:00:00 2001 From: MrNaif2018 Date: Fri, 20 Dec 2024 19:11:10 +0300 Subject: [PATCH] Fix dockerfile ENV warnings --- compose/Dockerfile-coin.template | 8 ++++---- compose/backend.Dockerfile | 2 +- compose/bch.Dockerfile | 8 ++++---- compose/bnb.Dockerfile | 8 ++++---- compose/bsty.Dockerfile | 8 ++++---- compose/btc.Dockerfile | 8 ++++---- compose/eth.Dockerfile | 8 ++++---- compose/grs.Dockerfile | 8 ++++---- compose/ltc.Dockerfile | 8 ++++---- compose/matic.Dockerfile | 8 ++++---- compose/sbch.Dockerfile | 8 ++++---- compose/trx.Dockerfile | 8 ++++---- compose/xmr.Dockerfile | 8 ++++---- compose/xrg.Dockerfile | 8 ++++---- dev-setup.sh | 6 +++++- 15 files changed, 58 insertions(+), 54 deletions(-) diff --git a/compose/Dockerfile-coin.template b/compose/Dockerfile-coin.template index 928e845..8ccf728 100644 --- a/compose/Dockerfile-coin.template +++ b/compose/Dockerfile-coin.template @@ -1,10 +1,10 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.{{ env.name }}{{ if env.custom == "false" and env.coin != "btc" then "-"+env.coin else "" end }} +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.{{ env.name }}{{ if env.custom == "false" and env.coin != "btc" then "-"+env.coin else "" end }} ENV IN_DOCKER=1 -ENV {{ env.coin | ascii_upcase }}_HOST 0.0.0.0 +ENV {{ env.coin | ascii_upcase }}_HOST=0.0.0.0 LABEL org.bitcart.image={{ env.coin }}-daemon FROM base AS compile-image diff --git a/compose/backend.Dockerfile b/compose/backend.Dockerfile index 1444994..6999142 100644 --- a/compose/backend.Dockerfile +++ b/compose/backend.Dockerfile @@ -6,7 +6,7 @@ FROM python:3.11-slim-bullseye ARG TARGETPLATFORM ENV IN_DOCKER=1 -ENV GOSU_VERSION 1.16 +ENV GOSU_VERSION=1.16 LABEL org.bitcart.image=backend COPY bitcart /app diff --git a/compose/bch.Dockerfile b/compose/bch.Dockerfile index 728413c..539002b 100644 --- a/compose/bch.Dockerfile +++ b/compose/bch.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.electron-cash +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.electron-cash ENV IN_DOCKER=1 -ENV BCH_HOST 0.0.0.0 +ENV BCH_HOST=0.0.0.0 LABEL org.bitcart.image=bch-daemon FROM base AS compile-image diff --git a/compose/bnb.Dockerfile b/compose/bnb.Dockerfile index 980a93a..de5871e 100644 --- a/compose/bnb.Dockerfile +++ b/compose/bnb.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.bitcart-bnb +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.bitcart-bnb ENV IN_DOCKER=1 -ENV BNB_HOST 0.0.0.0 +ENV BNB_HOST=0.0.0.0 LABEL org.bitcart.image=bnb-daemon FROM base AS compile-image diff --git a/compose/bsty.Dockerfile b/compose/bsty.Dockerfile index dbf6505..0cebcbc 100644 --- a/compose/bsty.Dockerfile +++ b/compose/bsty.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.electrum-bsty +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.electrum-bsty ENV IN_DOCKER=1 -ENV BSTY_HOST 0.0.0.0 +ENV BSTY_HOST=0.0.0.0 LABEL org.bitcart.image=bsty-daemon FROM base AS compile-image diff --git a/compose/btc.Dockerfile b/compose/btc.Dockerfile index 3d56f54..bb1bc83 100644 --- a/compose/btc.Dockerfile +++ b/compose/btc.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.electrum +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.electrum ENV IN_DOCKER=1 -ENV BTC_HOST 0.0.0.0 +ENV BTC_HOST=0.0.0.0 LABEL org.bitcart.image=btc-daemon FROM base AS compile-image diff --git a/compose/eth.Dockerfile b/compose/eth.Dockerfile index 2b923cf..d3d8c60 100644 --- a/compose/eth.Dockerfile +++ b/compose/eth.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.bitcart-eth +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.bitcart-eth ENV IN_DOCKER=1 -ENV ETH_HOST 0.0.0.0 +ENV ETH_HOST=0.0.0.0 LABEL org.bitcart.image=eth-daemon FROM base AS compile-image diff --git a/compose/grs.Dockerfile b/compose/grs.Dockerfile index 43723e7..4037fbe 100644 --- a/compose/grs.Dockerfile +++ b/compose/grs.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.electrum-grs +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.electrum-grs ENV IN_DOCKER=1 -ENV GRS_HOST 0.0.0.0 +ENV GRS_HOST=0.0.0.0 LABEL org.bitcart.image=grs-daemon FROM base AS compile-image diff --git a/compose/ltc.Dockerfile b/compose/ltc.Dockerfile index b7f6f9a..4b71151 100644 --- a/compose/ltc.Dockerfile +++ b/compose/ltc.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.electrum-ltc +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.electrum-ltc ENV IN_DOCKER=1 -ENV LTC_HOST 0.0.0.0 +ENV LTC_HOST=0.0.0.0 LABEL org.bitcart.image=ltc-daemon FROM base AS compile-image diff --git a/compose/matic.Dockerfile b/compose/matic.Dockerfile index 11fc689..5cb1b9e 100644 --- a/compose/matic.Dockerfile +++ b/compose/matic.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.bitcart-matic +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.bitcart-matic ENV IN_DOCKER=1 -ENV MATIC_HOST 0.0.0.0 +ENV MATIC_HOST=0.0.0.0 LABEL org.bitcart.image=matic-daemon FROM base AS compile-image diff --git a/compose/sbch.Dockerfile b/compose/sbch.Dockerfile index e39f7f2..e3003c8 100644 --- a/compose/sbch.Dockerfile +++ b/compose/sbch.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.bitcart-sbch +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.bitcart-sbch ENV IN_DOCKER=1 -ENV SBCH_HOST 0.0.0.0 +ENV SBCH_HOST=0.0.0.0 LABEL org.bitcart.image=sbch-daemon FROM base AS compile-image diff --git a/compose/trx.Dockerfile b/compose/trx.Dockerfile index 4b73a09..954f417 100644 --- a/compose/trx.Dockerfile +++ b/compose/trx.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.bitcart-trx +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.bitcart-trx ENV IN_DOCKER=1 -ENV TRX_HOST 0.0.0.0 +ENV TRX_HOST=0.0.0.0 LABEL org.bitcart.image=trx-daemon FROM base AS compile-image diff --git a/compose/xmr.Dockerfile b/compose/xmr.Dockerfile index 5466af1..6f57194 100644 --- a/compose/xmr.Dockerfile +++ b/compose/xmr.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.bitcart-xmr +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.bitcart-xmr ENV IN_DOCKER=1 -ENV XMR_HOST 0.0.0.0 +ENV XMR_HOST=0.0.0.0 LABEL org.bitcart.image=xmr-daemon FROM base AS compile-image diff --git a/compose/xrg.Dockerfile b/compose/xrg.Dockerfile index a3497ad..bcf163c 100644 --- a/compose/xrg.Dockerfile +++ b/compose/xrg.Dockerfile @@ -6,11 +6,11 @@ FROM python:3.11-alpine AS base -ENV ELECTRUM_USER electrum -ENV ELECTRUM_HOME /home/$ELECTRUM_USER -ENV ELECTRUM_DIRECTORY ${ELECTRUM_HOME}/.oregano +ENV ELECTRUM_USER=electrum +ENV ELECTRUM_HOME=/home/$ELECTRUM_USER +ENV ELECTRUM_DIRECTORY=${ELECTRUM_HOME}/.oregano ENV IN_DOCKER=1 -ENV XRG_HOST 0.0.0.0 +ENV XRG_HOST=0.0.0.0 LABEL org.bitcart.image=xrg-daemon FROM base AS compile-image diff --git a/dev-setup.sh b/dev-setup.sh index de2288a..6974b0a 100755 --- a/dev-setup.sh +++ b/dev-setup.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash set -e -sudo apt install -y git +if [[ "$OSTYPE" == "darwin"* ]]; then + brew install git +else + sudo apt install -y git +fi branch=${1:-master} rm -rf compose/bitcart && git clone --depth=1 https://github.com/bitcart/bitcart -b $branch compose/bitcart cd compose/bitcart