Fallback to git clone if GNUnet tarball missing docs
This commit is contained in:
parent
fcf46fb0e8
commit
0636213553
1 changed files with 19 additions and 10 deletions
29
Dockerfile
29
Dockerfile
|
|
@ -20,17 +20,26 @@ RUN apt-get update && apt-get install -y \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# GNUnet (falls nicht schon systemweit neu genug)
|
# GNUnet (falls nicht schon systemweit neu genug)
|
||||||
RUN if [ -n "${GNUNET_TARBALL_URL}" ]; then \
|
RUN set -e; \
|
||||||
mkdir -p /src && cd /src && \
|
mkdir -p /src && cd /src; \
|
||||||
curl -L "${GNUNET_TARBALL_URL}" -o gnunet.tar.gz && \
|
GNUNET_DIR=""; \
|
||||||
tar xzf gnunet.tar.gz && \
|
if [ -n "${GNUNET_TARBALL_URL}" ]; then \
|
||||||
cd gnunet-* && ./bootstrap && \
|
echo "Fetching GNUnet tarball ${GNUNET_TARBALL_URL}"; \
|
||||||
./configure --prefix=/usr && make -j$(nproc) && make install; \
|
curl -L "${GNUNET_TARBALL_URL}" -o gnunet.tar.gz; \
|
||||||
|
tar xzf gnunet.tar.gz; \
|
||||||
|
GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \
|
||||||
|
if [ ! -f "${GNUNET_DIR}/doc/handbook/meson.build" ]; then \
|
||||||
|
echo "Tarball seems incomplete (doc/handbook/meson.build missing); falling back to git clone ${GNUNET_REF}"; \
|
||||||
|
rm -rf "${GNUNET_DIR}"; \
|
||||||
|
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
||||||
|
GNUNET_DIR="gnunet"; \
|
||||||
|
fi; \
|
||||||
else \
|
else \
|
||||||
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git /src/gnunet && \
|
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
||||||
cd /src/gnunet && ./bootstrap && \
|
GNUNET_DIR="gnunet"; \
|
||||||
./configure --prefix=/usr && make -j$(nproc) && make install; \
|
fi; \
|
||||||
fi
|
cd "${GNUNET_DIR}" && ./bootstrap && \
|
||||||
|
./configure --prefix=/usr && make -j$(nproc) && make install
|
||||||
|
|
||||||
# Taler Exchange + Merchant
|
# Taler Exchange + Merchant
|
||||||
RUN git clone --depth 1 --branch "${EXCHANGE_REF}" https://git.taler.net/exchange.git /src/exchange && \
|
RUN git clone --depth 1 --branch "${EXCHANGE_REF}" https://git.taler.net/exchange.git /src/exchange && \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue