nocci/gnutaler-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Detect taler-exchange/merchant tarball directories when unpacked

Browse source
This commit is contained in:
nocci 2025-12-12 12:47:16 +00:00
parent c3ff325ee0
commit b90cb42e3b
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

@ -77,14 +77,14 @@ RUN set -e; \
mkdir -p /src && cd /src; \ mkdir -p /src && cd /src; \
cp "${LOCAL_TARBALL}" exchange.tar.gz; \ cp "${LOCAL_TARBALL}" exchange.tar.gz; \
tar xzf exchange.tar.gz; \ tar xzf exchange.tar.gz; \
EXCHANGE_DIR="$(ls -d exchange-* | head -1)"; \ EXCHANGE_DIR="$(ls -d taler-exchange-* exchange-* 2>/dev/null | head -1)"; \
EXCHANGE_TAR=1; \ EXCHANGE_TAR=1; \
elif [ -n "${EXCHANGE_TARBALL_URL}" ]; then \ elif [ -n "${EXCHANGE_TARBALL_URL}" ]; then \
echo "Fetching Exchange tarball ${EXCHANGE_TARBALL_URL}"; \ echo "Fetching Exchange tarball ${EXCHANGE_TARBALL_URL}"; \
mkdir -p /src && cd /src; \ mkdir -p /src && cd /src; \
curl -L "${EXCHANGE_TARBALL_URL}" -o exchange.tar.gz; \ curl -L "${EXCHANGE_TARBALL_URL}" -o exchange.tar.gz; \
tar xzf exchange.tar.gz; \ tar xzf exchange.tar.gz; \
EXCHANGE_DIR="$(ls -d exchange-* | head -1)"; \ EXCHANGE_DIR="$(ls -d taler-exchange-* exchange-* 2>/dev/null | head -1)"; \
EXCHANGE_TAR=1; \ EXCHANGE_TAR=1; \
else \ else \
git clone --depth 1 --branch "${EXCHANGE_REF}" https://git.taler.net/exchange.git /src/exchange; \ git clone --depth 1 --branch "${EXCHANGE_REF}" https://git.taler.net/exchange.git /src/exchange; \
@ -122,7 +122,7 @@ RUN set -e; \
mkdir -p /src && cd /src; \ mkdir -p /src && cd /src; \
cp "${LOCAL_TARBALL}" merchant.tar.gz; \ cp "${LOCAL_TARBALL}" merchant.tar.gz; \
tar xzf merchant.tar.gz; \ tar xzf merchant.tar.gz; \
MERCHANT_DIR="$(ls -d merchant-* | head -1)"; \ MERCHANT_DIR="$(ls -d taler-merchant-* merchant-* 2>/dev/null | head -1)"; \
MERCHANT_TAR=1; \ MERCHANT_TAR=1; \
elif [ -n "${MERCHANT_TARBALL_URL}" ]; then \ elif [ -n "${MERCHANT_TARBALL_URL}" ]; then \
echo "Fetching Merchant tarball ${MERCHANT_TARBALL_URL}"; \ echo "Fetching Merchant tarball ${MERCHANT_TARBALL_URL}"; \