Run bootstrap for exchange/merchant if configure missing; init git for tarballs
This commit is contained in:
parent
831a473fbe
commit
e1362911fd
1 changed files with 12 additions and 6 deletions
18
Dockerfile
18
Dockerfile
|
|
@ -88,10 +88,13 @@ RUN set -e; \
|
||||||
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; \
|
||||||
EXCHANGE_DIR="/src/exchange"; \
|
EXCHANGE_DIR="/src/exchange"; \
|
||||||
fi; \
|
fi; \
|
||||||
if [ "${EXCHANGE_TAR}" = "0" ]; then \
|
if [ ! -f "${EXCHANGE_DIR}/configure" ]; then \
|
||||||
cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
|
if [ ! -d "${EXCHANGE_DIR}/.git" ]; then \
|
||||||
|
(cd "${EXCHANGE_DIR}" && git init >/dev/null 2>&1); \
|
||||||
|
fi; \
|
||||||
|
cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./bootstrap; \
|
||||||
else \
|
else \
|
||||||
echo "Skipping bootstrap for Exchange tarball"; \
|
echo "Skipping bootstrap for Exchange (configure present)"; \
|
||||||
fi; \
|
fi; \
|
||||||
cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./configure --prefix=/usr && make -j$(nproc) && make install; \
|
cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./configure --prefix=/usr && make -j$(nproc) && make install; \
|
||||||
# Merchant
|
# Merchant
|
||||||
|
|
@ -115,10 +118,13 @@ RUN set -e; \
|
||||||
git clone --depth 1 --branch "${MERCHANT_REF}" https://git.taler.net/merchant.git /src/merchant; \
|
git clone --depth 1 --branch "${MERCHANT_REF}" https://git.taler.net/merchant.git /src/merchant; \
|
||||||
MERCHANT_DIR="/src/merchant"; \
|
MERCHANT_DIR="/src/merchant"; \
|
||||||
fi; \
|
fi; \
|
||||||
if [ "${MERCHANT_TAR}" = "0" ]; then \
|
if [ ! -f "${MERCHANT_DIR}/configure" ]; then \
|
||||||
cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
|
if [ ! -d "${MERCHANT_DIR}/.git" ]; then \
|
||||||
|
(cd "${MERCHANT_DIR}" && git init >/dev/null 2>&1); \
|
||||||
|
fi; \
|
||||||
|
cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./bootstrap; \
|
||||||
else \
|
else \
|
||||||
echo "Skipping bootstrap for Merchant tarball"; \
|
echo "Skipping bootstrap for Merchant (configure present)"; \
|
||||||
fi; \
|
fi; \
|
||||||
cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./configure --prefix=/usr && make -j$(nproc) && make install
|
cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./configure --prefix=/usr && make -j$(nproc) && make install
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue