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
d9cd3bc8
Commit
d9cd3bc8
authored
5 years ago
by
Erwan Rouchet
Committed by
Bastien Abadie
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add cryptography to the base image
parent
0c4da7c0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
base/Dockerfile
+1
-1
1 addition, 1 deletion
base/Dockerfile
base/requirements.txt
+1
-0
1 addition, 0 deletions
base/requirements.txt
with
5 additions
and
4 deletions
.gitlab-ci.yml
+
2
−
2
View file @
d9cd3bc8
image
:
registry.gitlab.com/arkindex/backend:base-0.9.
4
image
:
registry.gitlab.com/arkindex/backend:base-0.9.
6
stages
:
-
test
-
build
...
...
@@ -8,7 +8,7 @@ cache:
-
.cache/pip
before_script
:
-
apk --update add build-base
libffi-dev openssl-dev
-
apk --update add build-base
# Custom line to install our own deps from Git using GitLab CI credentials
-
"
pip
install
-e
git+https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/arkindex/common#egg=arkindex-common"
-
"
pip
install
-e
git+https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/arkindex/ponos#egg=ponos-server"
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
1
−
1
View file @
d9cd3bc8
FROM
registry.gitlab.com/arkindex/backend:base-0.9.
4
FROM
registry.gitlab.com/arkindex/backend:base-0.9.
6
ARG
COMMON_BRANCH=master
ARG
COMMON_ID=9855787
...
...
This diff is collapsed.
Click to expand it.
base/Dockerfile
+
1
−
1
View file @
d9cd3bc8
...
...
@@ -3,7 +3,7 @@ FROM python:3.6-alpine as base
FROM
base
as
staging
# Add system dependencies, use cache by copying requirements
RUN
apk add
--update
--no-cache
postgresql-dev jpeg-dev build-base
gzip
zlib-dev libmagic libxml2-dev libxslt-dev
RUN
apk add
--update
--no-cache
postgresql-dev jpeg-dev build-base
gzip
zlib-dev libmagic libxml2-dev libxslt-dev
libffi-dev
# Install long buildtime deps
# Uses a source archive instead of full local copy to speedup docker build
...
...
This diff is collapsed.
Click to expand it.
base/requirements.txt
+
1
−
0
View file @
d9cd3bc8
cryptography>=2.7
Django==2.2
elasticsearch==6.2.0
ijson==2.3
...
...
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