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
76da7b7e
Commit
76da7b7e
authored
4 years ago
by
Bastien Abadie
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix-base-requirement' into 'master'
Restore lxml requirement in base image for arkindex_common Closes
#378
See merge request
!879
parents
59360cc8
3f2de8d3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!879
Restore lxml requirement in base image for arkindex_common
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+2
-2
2 additions, 2 deletions
Dockerfile
Dockerfile.binary
+1
-1
1 addition, 1 deletion
Dockerfile.binary
base/requirements.txt
+1
-0
1 addition, 0 deletions
base/requirements.txt
with
4 additions
and
3 deletions
Dockerfile
+
2
−
2
View file @
76da7b7e
FROM
registry.gitlab.com/arkindex/backend/base:django-3.1
as
build
FROM
registry.gitlab.com/arkindex/backend/base:django-3.1
-lxml
as
build
RUN
mkdir
build
ADD
. build
RUN
cd
build
&&
python3 setup.py sdist
FROM
registry.gitlab.com/arkindex/backend/base:django-3.1
FROM
registry.gitlab.com/arkindex/backend/base:django-3.1
-lxml
ARG
COMMON_BRANCH=master
ARG
COMMON_ID=9855787
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.binary
+
1
−
1
View file @
76da7b7e
...
...
@@ -57,7 +57,7 @@ RUN python -m nuitka \
arkindex/manage.py
# Start over from a clean setup
FROM registry.gitlab.com/arkindex/backend/base:django-3.1 as build
FROM registry.gitlab.com/arkindex/backend/base:django-3.1
-lxml
as build
# Import files from compilation
RUN mkdir /usr/share/arkindex
...
...
This diff is collapsed.
Click to expand it.
base/requirements.txt
+
1
−
0
View file @
76da7b7e
...
...
@@ -4,6 +4,7 @@ Django==3.1
elasticsearch==6.2.0
hiredis==1.0.0
ijson==2.3
lxml==4.2.3
openpyxl==2.4.9
psycopg2==2.8.5
python-Levenshtein==0.12.0
...
...
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