Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arkindex
Backend
Commits
41b9211c
Commit
41b9211c
authored
4 years ago
by
Bastien Abadie
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Run docker builds on MR CI"
This reverts commit
7c97c599
.
parent
9b6faa40
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+10
-0
10 additions, 0 deletions
Dockerfile
Dockerfile.binary
+11
-1
11 additions, 1 deletion
Dockerfile.binary
with
21 additions
and
1 deletion
Dockerfile
+
10
−
0
View file @
41b9211c
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.binary
+
11
−
1
View file @
41b9211c
...
...
@@ -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 \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment