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
f863ab80
Commit
f863ab80
authored
1 year ago
by
Bastien Abadie
Committed by
Erwan Rouchet
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix binary build
parent
997080ff
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!2019
Fix binary build
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Dockerfile
+2
-2
2 additions, 2 deletions
Dockerfile
Dockerfile.binary
+2
-2
2 additions, 2 deletions
Dockerfile.binary
base/Dockerfile
+1
-1
1 addition, 1 deletion
base/Dockerfile
with
6 additions
and
6 deletions
.gitlab-ci.yml
+
1
−
1
View file @
f863ab80
...
@@ -11,7 +11,7 @@ include:
...
@@ -11,7 +11,7 @@ include:
# For jobs that run backend scripts directly
# For jobs that run backend scripts directly
.backend-setup
:
.backend-setup
:
image
:
registry.gitlab.com/teklia/arkindex/backend/base:
lxml-4.9.2
image
:
registry.gitlab.com/teklia/arkindex/backend/base:
bookworm
cache
:
cache
:
paths
:
paths
:
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
2
−
2
View file @
f863ab80
FROM
registry.gitlab.com/teklia/arkindex/backend/base:
lxml-4.9.2
as
build
FROM
registry.gitlab.com/teklia/arkindex/backend/base:
bookworm
as
build
RUN
mkdir
build
RUN
mkdir
build
ADD
. build
ADD
. build
RUN
cd
build
&&
python3 setup.py sdist
RUN
cd
build
&&
python3 setup.py sdist
FROM
registry.gitlab.com/teklia/arkindex/backend/base:
lxml-4.9.2
FROM
registry.gitlab.com/teklia/arkindex/backend/base:
bookworm
ARG
TRANSKRIBUS_BRANCH=master
ARG
TRANSKRIBUS_BRANCH=master
ARG
TRANSKRIBUS_ID=11180199
ARG
TRANSKRIBUS_ID=11180199
ARG
LICENSE_BRANCH=master
ARG
LICENSE_BRANCH=master
...
...
This diff is collapsed.
Click to expand it.
Dockerfile.binary
+
2
−
2
View file @
f863ab80
FROM python:3.10-slim AS compilation
FROM python:3.10-slim
-bookworm
AS compilation
RUN apt-get update && apt-get install --no-install-recommends -y build-essential wget
RUN apt-get update && apt-get install --no-install-recommends -y build-essential wget
...
@@ -61,7 +61,7 @@ RUN python -m nuitka \
...
@@ -61,7 +61,7 @@ RUN python -m nuitka \
arkindex/manage.py
arkindex/manage.py
# Start over from a clean setup
# Start over from a clean setup
FROM registry.gitlab.com/teklia/arkindex/backend/base:
lxml-4.9.2
as build
FROM registry.gitlab.com/teklia/arkindex/backend/base:
bookworm
as build
# Import files from compilation
# Import files from compilation
RUN mkdir /usr/share/arkindex
RUN mkdir /usr/share/arkindex
...
...
This diff is collapsed.
Click to expand it.
base/Dockerfile
+
1
−
1
View file @
f863ab80
FROM
python:3.10-slim
FROM
python:3.10-slim
-bookworm
# Install some runtime deps and python dependencies that are slow to install or require specific build deps
# Install some runtime deps and python dependencies that are slow to install or require specific build deps
ADD
requirements.txt bootstrap.sh /
ADD
requirements.txt bootstrap.sh /
...
...
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