Git submodule workaround.

Deleting the remote tracking master first,
before creating a new one pointing to the
local checkout.

3 files changed, 24 insertions, 20 deletions

diff --git a/docker/demo/backup.sh b/docker/demo/backup.sh
index 18b8152..ed95910 100755
--- a/docker/demo/backup.sh
+++ b/docker/demo/backup.sh
@@ -23,8 +23,8 @@ fi
 # have the TAR owned by the user invoking the command.
 docker run \
   -v /tmp:/tmp \
-  -v hybrid_talerdata:/taler-data \
-  -v hybrid_talerlogs:/taler-logs \
+  -v demo_talerdata:/taler-data \
+  -v demo_talerlogs:/taler-logs \
   -it debian:stable \
   /bin/bash -c "tar --no-same-owner --no-same-permissions -c -f ${BACKUP_FILE} /taler-data /taler-logs && chown $(id --user):$(id --group) ${BACKUP_FILE}" > /dev/null
 
diff --git a/docker/demo/images/base/Dockerfile b/docker/demo/images/base/Dockerfile
index 86defb4..cd99ac8 100644
--- a/docker/demo/images/base/Dockerfile
+++ b/docker/demo/images/base/Dockerfile
@@ -14,21 +14,21 @@ ARG tags_file
 COPY ${tags_file:-taler_notags} /tags.sh
 
 RUN . /tags.sh && git clone git://git.gnunet.org/libmicrohttpd \
-  --branch ${TAG_LIBMHD:-master} --depth 1
+  --branch ${TAG_LIBMHD:-master}
 RUN . /tags.sh && git clone git://git.gnunet.org/gnunet \
-  --branch ${TAG_GNUNET:-master} --depth 1
+  --branch ${TAG_GNUNET:-master}
 RUN . /tags.sh && git clone git://git.taler.net/exchange \
-  --branch ${TAG_EXCHANGE:-master} --depth 1
+  --branch ${TAG_EXCHANGE:-master}
 RUN . /tags.sh && git clone git://git.taler.net/merchant \
-  --branch ${TAG_MERCHANT:-master} --depth 1
+  --branch ${TAG_MERCHANT:-master}
 RUN . /tags.sh && git clone git://git.taler.net/libeufin \
-  --branch ${TAG_LIBEUFIN:-master} --depth 1
+  --branch ${TAG_LIBEUFIN:-master}
 RUN . /tags.sh && git clone git://git.taler.net/taler-merchant-demos \
-  --branch ${TAG_MERCHANT_DEMOS:-master} --depth 1
+  --branch ${TAG_MERCHANT_DEMOS:-master}
 RUN . /tags.sh && git clone git://git.taler.net/wallet-core \
-  --branch ${TAG_WALLET:-master} --depth 1
+  --branch ${TAG_WALLET:-master}
 RUN . /tags.sh && git clone git://git.taler.net/sync \
-  --branch ${TAG_SYNC:-master} --depth 1
+  --branch ${TAG_SYNC:-master}
 
 WORKDIR /libmicrohttpd
 RUN ./bootstrap
@@ -41,13 +41,17 @@ RUN ./configure --enable-logging=verbose --disable-documentation
 RUN make install
 
 WORKDIR /exchange
-# Workaround a reported issue where the bootstrap script
-# always pulls the latest submodule version.  That breaks
-# when moving the main repository to past versions.  6b9824c
-# is compatible with v0.9.0 
-RUN git -C contrib/gana pull
-RUN if . /tags.sh && test "${TAG_EXCHANGE:-}" = "v0.9.0"; then git -C contrib/gana checkout 6b9824c; fi
-RUN if . /tags.sh && test "${TAG_EXCHANGE:-}" = "v0.9.0"; then git submodule set-uri contrib/gana .; fi
+RUN if . /tags.sh && test "${TAG_EXCHANGE:-}" = "v0.9.0"; then \
+  # Init Gana and checkout the v0.9.0-compatible commit.
+  git submodule init contrib/gana; \
+  git submodule update --remote contrib/gana; \
+  # Note: without init first, the following checkout hits "reference is not a tree".
+  git -C contrib/gana checkout 6b9824cb4d4561f1167c7f518998a226a82222d6; \
+  # Remove master branch tracking the remote
+  git -C contrib/gana branch -d master; \
+  git -C contrib/gana remote set-url origin .; \
+  git -C contrib/gana branch master; \
+fi
 RUN ./bootstrap
 RUN ./configure CFLAGS="-ggdb -O0" --enable-logging=verbose --disable-doc
 RUN make install
diff --git a/docker/demo/import-backup.sh b/docker/demo/import-backup.sh
index 4fdb9c4..6e13919 100755
--- a/docker/demo/import-backup.sh
+++ b/docker/demo/import-backup.sh
@@ -13,7 +13,7 @@ if ! docker images | grep debian | grep stable > /dev/null; then
 fi
 
 if test -z $1; then
-  echo "Please, give the backup (TAR) file\'s path as the one argument."
+  echo "Please, give the backup (TAR) file's path as the one argument."
   exit 1
 fi
 
@@ -24,6 +24,6 @@ fi
 
 docker run \
   -v $1:/tmp/backup.tar \
-  -v hybrid_talerdata:/taler-data \
-  -v hybrid_talerlogs:/taler-logs \
+  -v demo_talerdata:/taler-data \
+  -v demo_talerlogs:/taler-logs \
   -it debian:stable /bin/bash -c "tar -x -f /tmp/backup.tar"