From 41b9211c7b8d352a5684b445251e3bef3605e900 Mon Sep 17 00:00:00 2001
From: Bastien Abadie <bastien@nextcairn.com>
Date: Wed, 26 Aug 2020 13:05:46 +0000
Subject: [PATCH] Revert "Run docker builds on MR CI"
This reverts commit 7c97c5991392c2e03a75d29fb030bb879bff35bc.
---
Dockerfile | 10 ++++++++++
Dockerfile.binary | 12 +++++++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 8887025a31..a1343d7c23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,8 @@ ARG COMMON_BRANCH=master
ARG COMMON_ID=9855787
ARG PONOS_BRANCH=master
ARG PONOS_ID=10017043
+ARG TRANSKRIBUS_BRANCH=master
+ARG TRANSKRIBUS_ID=11180199
ARG GITLAB_TOKEN="gaFM7LRa9zy9QMowcUhx"
# Install arkindex-common from private repo
@@ -29,6 +31,14 @@ RUN \
cd /tmp/ponos && pip install --disable-pip-version-check --no-cache-dir --quiet . && \
rm -rf /tmp/ponos
+# Install transkribus-client from private repo
+RUN \
+ mkdir /tmp/transkribus && \
+ wget --header "PRIVATE-TOKEN: $GITLAB_TOKEN" https://gitlab.com/api/v4/projects/$TRANSKRIBUS_ID/repository/archive.tar.gz?sha=$TRANSKRIBUS_BRANCH -O /tmp/transkribus/archive.tar.gz && \
+ tar --strip-components=1 -xvf /tmp/transkribus/archive.tar.gz -C /tmp/transkribus && \
+ cd /tmp/transkribus && pip install --disable-pip-version-check --no-cache-dir --quiet . && \
+ rm -rf /tmp/transkribus
+
# Install arkindex and its deps
# Uses a source archive instead of full local copy to speedup docker build
COPY --from=build /build/dist/arkindex-*.tar.gz /tmp/arkindex.tar.gz
diff --git a/Dockerfile.binary b/Dockerfile.binary
index 1f9fb3ef15..e05d93a63c 100644
--- a/Dockerfile.binary
+++ b/Dockerfile.binary
@@ -6,6 +6,8 @@ ARG COMMON_BRANCH=master
ARG COMMON_ID=9855787
ARG PONOS_BRANCH=master
ARG PONOS_ID=10017043
+ARG TRANSKRIBUS_BRANCH=master
+ARG TRANSKRIBUS_ID=11180199
ARG GITLAB_TOKEN="gaFM7LRa9zy9QMowcUhx"
# We build in /usr/share because Django will try to load some files relative to that path
@@ -29,10 +31,17 @@ RUN mkdir /tmp/ponos && \
tar --strip-components=1 -xvf /tmp/ponos.tar.gz -C /tmp/ponos && \
mv /tmp/ponos/ponos /usr/share
+# Install transkribus-client from private repo
+RUN \
+ mkdir /tmp/transkribus && \
+ wget --header "PRIVATE-TOKEN: $GITLAB_TOKEN" https://gitlab.com/api/v4/projects/$TRANSKRIBUS_ID/repository/archive.tar.gz?sha=$TRANSKRIBUS_BRANCH -O /tmp/transkribus.tar.gz && \
+ tar --strip-components=1 -xvf /tmp/transkribus.tar.gz -C /tmp/transkribus && \
+ mv /tmp/transkribus/transkribus /usr/share
+
# Build full requirements, removing relative or remote references to arkindex projects
# Special case for apistar, where we want to keep our own fork
# Special case for approximate requirements from ponos, where we want to keep the versions specified from this repo
-RUN cat /tmp/common/requirements.txt /tmp/ponos/requirements-server.txt /tmp/requirements-*arkindex.txt | sort | uniq | grep -v -E '^apistar|arkindex|^#|^Django~=|^boto3~=|^cryptography~=|^django-enumfields~=|^djangorestframework~=|^pyyaml~=' > /requirements.txt
+RUN cat /tmp/common/requirements.txt /tmp/ponos/requirements-server.txt /tmp/requirements-*arkindex.txt | sort | uniq | grep -v -E '^apistar|arkindex|^#|^Django~=|^boto3~=|^cryptography~=|^django-enumfields~=|^djangorestframework~=|^pyyaml~=|transkribus-client' > /requirements.txt
# List all management commands
RUN find /usr/share/arkindex/*/management -name '*.py' -not -name '__init__.py' > /commands.txt
@@ -50,6 +59,7 @@ RUN python -m nuitka \
--include-package=arkindex \
--include-package=arkindex_common \
--include-package=ponos \
+ --include-package=transkribus \
--show-progress \
--python-flag=-OO \
--lto \
--
GitLab