From f863ab806f6d7fdd0087d75030b9fb3605bb333f Mon Sep 17 00:00:00 2001
From: Bastien Abadie <abadie@teklia.com>
Date: Tue, 20 Jun 2023 13:03:08 +0000
Subject: [PATCH] Fix binary build
---
.gitlab-ci.yml | 2 +-
Dockerfile | 4 ++--
Dockerfile.binary | 4 ++--
base/Dockerfile | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21b47e356e..b6279bd440 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ include:
# For jobs that run backend scripts directly
.backend-setup:
- image: registry.gitlab.com/teklia/arkindex/backend/base:lxml-4.9.2
+ image: registry.gitlab.com/teklia/arkindex/backend/base:bookworm
cache:
paths:
diff --git a/Dockerfile b/Dockerfile
index b6baf42cec..a93f5b71f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-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
ADD . build
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_ID=11180199
ARG LICENSE_BRANCH=master
diff --git a/Dockerfile.binary b/Dockerfile.binary
index 6725ad5bab..dfb76b1ed2 100644
--- a/Dockerfile.binary
+++ b/Dockerfile.binary
@@ -1,4 +1,4 @@
-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
@@ -61,7 +61,7 @@ RUN python -m nuitka \
arkindex/manage.py
# 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
RUN mkdir /usr/share/arkindex
diff --git a/base/Dockerfile b/base/Dockerfile
index c24eb78429..4f7b450ba7 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,4 +1,4 @@
-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
ADD requirements.txt bootstrap.sh /
--
GitLab