Skip to content

Commit 96e0747

Browse files
jamshaleWadeBarnes
andauthored
Upgrade to bookworm (openwallet-foundation#3498)
* Upgrade from bullseye to bookworm - Bullseye EOL LTS is 2026-08-31 - Bookworm is the current LTS release. Signed-off-by: Wade Barnes <[email protected]> * Remove extra libraries Signed-off-by: jamshale <[email protected]> * Remove -> remove command Signed-off-by: jamshale <[email protected]> * Demo image needs curl Signed-off-by: jamshale <[email protected]> --------- Signed-off-by: Wade Barnes <[email protected]> Signed-off-by: jamshale <[email protected]> Co-authored-by: Wade Barnes <[email protected]>
1 parent f0c62cb commit 96e0747

File tree

4 files changed

+12
-19
lines changed

4 files changed

+12
-19
lines changed

.devcontainer/devcontainer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dockerfile": "Dockerfile",
77
"context": "..",
88
"args": {
9-
"VARIANT": "3.12-bullseye",
9+
"VARIANT": "3.12-bookworm",
1010
"POETRY_VERSION": "1.7.1"
1111
}
1212
},
@@ -48,16 +48,16 @@
4848
"features": {
4949
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
5050
},
51-
51+
5252
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
5353
"remoteUser": "vscode",
54-
54+
5555
"remoteEnv": {
5656
"RUST_LOG":"aries-askar::log::target=error"
5757
//"PATH": "${containerEnv:PATH}:${workspaceRoot}/.venv/bin"
5858
},
59-
59+
6060
"mounts": [],
6161
"postCreateCommand": "bash ./.devcontainer/post-install.sh"
62-
63-
}
62+
63+
}

docker/Dockerfile

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG python_version=3.12
2-
FROM python:${python_version}-slim-bullseye AS build
2+
FROM python:${python_version}-slim-bookworm AS build
33

44
WORKDIR /src
55

@@ -9,7 +9,7 @@ COPY ./pyproject.toml ./poetry.lock ./README.md ./
99
RUN pip install --no-cache-dir poetry==1.8.3
1010
RUN poetry build
1111

12-
FROM python:${python_version}-slim-bullseye AS main
12+
FROM python:${python_version}-slim-bookworm AS main
1313

1414
ARG uid=1001
1515
ARG user=aries
@@ -46,24 +46,17 @@ RUN apt-get update -y && \
4646
apt-get install -y --no-install-recommends \
4747
apt-transport-https \
4848
ca-certificates \
49-
build-essential \
50-
bzip2 \
5149
curl \
52-
git \
53-
less \
5450
libffi-dev \
5551
libgmp10 \
56-
liblzma5 \
5752
libncurses5 \
5853
libncursesw5 \
59-
libsecp256k1-0 \
60-
libzmq5 \
61-
net-tools \
6254
openssl \
6355
sqlite3 \
6456
zlib1g && \
6557
rm -rf /var/lib/apt/lists/* /usr/share/doc/*
6658

59+
6760
WORKDIR $HOME
6861

6962
# Add local binaries and aliases to path
@@ -103,7 +96,7 @@ RUN acapy_agent_package=$(find ./ -name "acapy_agent*.whl" | head -n 1) && \
10396

10497
# Clean-up unnecessary build dependencies and reduce final image size
10598
USER root
106-
RUN apt-get purge -y --auto-remove build-essential
99+
RUN apt-get purge -y
107100

108101
USER $user
109102

docker/Dockerfile.run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG python_version=3.12.4
2-
FROM python:3.12-slim-bullseye
2+
FROM python:3.12-slim-bookworm
33

44
RUN apt-get update -y && \
55
apt-get install -y --no-install-recommends \

docker/Dockerfile.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG python_version=3.12.4
2-
FROM python:${python_version}-slim-bullseye
2+
FROM python:${python_version}-slim-bookworm
33

44
RUN apt-get update -y && \
55
apt-get install -y --no-install-recommends \

0 commit comments

Comments
 (0)