Prefer local vendor gnunet tarball before GNUNET_TARBALL_URL
This commit is contained in:
parent
10d29fa6d7
commit
4753f689ef
1 changed files with 12 additions and 12 deletions
24
Dockerfile
24
Dockerfile
|
|
@ -23,18 +23,7 @@ RUN apt-get update && apt-get install -y \
|
||||||
RUN set -e; \
|
RUN set -e; \
|
||||||
mkdir -p /src && cd /src; \
|
mkdir -p /src && cd /src; \
|
||||||
GNUNET_DIR=""; \
|
GNUNET_DIR=""; \
|
||||||
if [ -n "${GNUNET_TARBALL_URL}" ]; then \
|
if ls /vendor/gnunet*.tar.gz >/dev/null 2>&1; then \
|
||||||
echo "Fetching GNUnet tarball ${GNUNET_TARBALL_URL}"; \
|
|
||||||
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; \
|
|
||||||
elif ls /vendor/gnunet*.tar.gz >/dev/null 2>&1; then \
|
|
||||||
LOCAL_TARBALL="$(ls /vendor/gnunet*.tar.gz | head -1)"; \
|
LOCAL_TARBALL="$(ls /vendor/gnunet*.tar.gz | head -1)"; \
|
||||||
echo "Using local GNUnet tarball from ${LOCAL_TARBALL}"; \
|
echo "Using local GNUnet tarball from ${LOCAL_TARBALL}"; \
|
||||||
cp "${LOCAL_TARBALL}" gnunet.tar.gz; \
|
cp "${LOCAL_TARBALL}" gnunet.tar.gz; \
|
||||||
|
|
@ -46,6 +35,17 @@ RUN set -e; \
|
||||||
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
||||||
GNUNET_DIR="gnunet"; \
|
GNUNET_DIR="gnunet"; \
|
||||||
fi; \
|
fi; \
|
||||||
|
elif [ -n "${GNUNET_TARBALL_URL}" ]; then \
|
||||||
|
echo "Fetching GNUnet tarball ${GNUNET_TARBALL_URL}"; \
|
||||||
|
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 gnunet; \
|
git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
|
||||||
GNUNET_DIR="gnunet"; \
|
GNUNET_DIR="gnunet"; \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue