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

Use autoreconf for exchange/merchant tarballs; add autoconf

Browse source
This commit is contained in:
nocci 2025-12-12 11:43:25 +00:00
parent e1362911fd
commit b13de688ba
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Dockerfile
View file

@ -14,7 +14,7 @@ ARG MERCHANT_TARBALL_URL=
ARG LIBEUFIN_TARBALL_URL= ARG LIBEUFIN_TARBALL_URL=
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential git automake libtool pkg-config \ build-essential git automake autoconf libtool pkg-config \
libgnutls28-dev libjansson-dev libsqlite3-dev libunistring-dev \ libgnutls28-dev libjansson-dev libsqlite3-dev libunistring-dev \
libcurl4-openssl-dev libmicrohttpd-dev libgcrypt20-dev libsodium-dev \ libcurl4-openssl-dev libmicrohttpd-dev libgcrypt20-dev libsodium-dev \
postgresql-client curl gnupg gettext gettext-base \ postgresql-client curl gnupg gettext gettext-base \
@ -88,14 +88,15 @@ 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}" = "1" ]; then \
cd "${EXCHANGE_DIR}" && autoreconf -fi; \
else \
if [ ! -f "${EXCHANGE_DIR}/configure" ]; then \ if [ ! -f "${EXCHANGE_DIR}/configure" ]; then \
if [ ! -d "${EXCHANGE_DIR}/.git" ]; then \ cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
(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 (configure present)"; \ echo "Skipping bootstrap for Exchange (configure present)"; \
fi; \ 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
MERCHANT_DIR=""; MERCHANT_TAR=0; \ MERCHANT_DIR=""; MERCHANT_TAR=0; \
@ -118,14 +119,15 @@ 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}" = "1" ]; then \
cd "${MERCHANT_DIR}" && autoreconf -fi; \
else \
if [ ! -f "${MERCHANT_DIR}/configure" ]; then \ if [ ! -f "${MERCHANT_DIR}/configure" ]; then \
if [ ! -d "${MERCHANT_DIR}/.git" ]; then \ cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
(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 (configure present)"; \ echo "Skipping bootstrap for Merchant (configure present)"; \
fi; \ 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
# LibEuFin (Bank) # LibEuFin (Bank)