Skip to content

Commit 35252ad

Browse files
johan-hultberg-workpataxis
authored andcommitted
Update workflows and dockerfiles to Ubuntu 24.04
1 parent bdd7d0c commit 35252ad

File tree

7 files changed

+27
-7
lines changed

7 files changed

+27
-7
lines changed

hello-world-python/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG UBUNTU_VERSION=22.04
3+
ARG UBUNTU_VERSION=24.04
44

55
FROM arm64v8/ubuntu:${UBUNTU_VERSION}
66

minimal-ml-inference/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG RUNTIME_VERSION=2.0.0
44
ARG REPO=axisecp
55
ARG IMAGE=acap-runtime
6-
ARG UBUNTU_VERSION=22.04
6+
ARG UBUNTU_VERSION=24.04
77

88
FROM ${REPO}/${IMAGE}:${RUNTIME_VERSION}-protofiles AS proto-image
99
FROM arm64v8/ubuntu:${UBUNTU_VERSION} AS runtime-image
@@ -12,6 +12,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
1212
apt-get update && apt-get install -y --no-install-recommends \
1313
python3 \
1414
python3-pip \
15+
python3-venv \
1516
ffmpeg \
1617
libsm6 \
1718
libxext6 \
@@ -20,6 +21,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
2021
# Copy list of grpc dependencies
2122
COPY --from=proto-image /build/requirements.txt .
2223

24+
# Create a virtual environment for installations using pip
25+
RUN python3 -m venv /opt/venv
26+
ENV PATH="/opt/venv/bin:$PATH"
2327
RUN pip install --no-cache-dir -r requirements.txt \
2428
numpy \
2529
opencv-python

object-detector-python/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG RUNTIME_VERSION=2.0.0
44
ARG REPO=axisecp
55
ARG IMAGE=acap-runtime
6-
ARG UBUNTU_VERSION=22.04
6+
ARG UBUNTU_VERSION=24.04
77

88
FROM ${REPO}/${IMAGE}:${RUNTIME_VERSION}-protofiles AS proto-image
99
FROM arm64v8/ubuntu:${UBUNTU_VERSION} AS runtime-image
@@ -12,6 +12,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
1212
apt-get update && apt-get install -y --no-install-recommends \
1313
python3 \
1414
python3-pip \
15+
python3-venv \
1516
ffmpeg \
1617
libsm6 \
1718
libxext6 \
@@ -20,6 +21,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
2021
# Copy list of grpc dependencies
2122
COPY --from=proto-image /build/requirements.txt .
2223

24+
# Create a virtual environment for installations using pip
25+
RUN python3 -m venv /opt/venv
26+
ENV PATH="/opt/venv/bin:$PATH"
2327
RUN pip install --no-cache-dir -r requirements.txt \
2428
numpy \
2529
opencv-python

opencv-qr-decoder-python/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG RUNTIME_VERSION=2.0.0
44
ARG REPO=axisecp
55
ARG IMAGE=acap-runtime
6-
ARG UBUNTU_VERSION=22.04
6+
ARG UBUNTU_VERSION=24.04
77

88
FROM ${REPO}/${IMAGE}:${RUNTIME_VERSION}-protofiles AS proto-image
99
FROM arm64v8/ubuntu:${UBUNTU_VERSION} AS runtime-image
@@ -12,6 +12,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
1212
apt-get update && apt-get install -y --no-install-recommends \
1313
python3 \
1414
python3-pip \
15+
python3-venv \
1516
ffmpeg \
1617
libsm6 \
1718
libxext6 \
@@ -20,6 +21,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
2021
# Copy list of grpc dependencies
2122
COPY --from=proto-image /build/requirements.txt .
2223

24+
# Create a virtual environment for installations using pip
25+
RUN python3 -m venv /opt/venv
26+
ENV PATH="/opt/venv/bin:$PATH"
2327
RUN pip install --no-cache-dir -r requirements.txt \
2428
numpy \
2529
opencv-python

parameter-api-python/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG RUNTIME_VERSION=2.0.0
44
ARG REPO=axisecp
55
ARG IMAGE=acap-runtime
6-
ARG UBUNTU_VERSION=22.04
6+
ARG UBUNTU_VERSION=24.04
77

88
FROM ${REPO}/${IMAGE}:${RUNTIME_VERSION}-protofiles AS proto-image
99
FROM arm64v8/ubuntu:${UBUNTU_VERSION} AS runtime-image
@@ -12,6 +12,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
1212
apt-get update && apt-get install -y --no-install-recommends \
1313
python3 \
1414
python3-pip \
15+
python3-venv \
1516
ca-certificates \
1617
&& rm -rf /var/lib/apt/lists/*
1718

@@ -21,6 +22,9 @@ RUN openssl req -x509 -batch -subj '/CN=localhost' -days 365 -newkey rsa:4096 -n
2122
# Copy list of grpc dependencies
2223
COPY --from=proto-image /build/requirements.txt .
2324

25+
# Create a virtual environment for installations using pip
26+
RUN python3 -m venv /opt/venv
27+
ENV PATH="/opt/venv/bin:$PATH"
2428
RUN pip install --no-cache-dir -r requirements.txt
2529

2630
WORKDIR /opt/app

pose-estimator-with-flask/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ARG RUNTIME_VERSION=2.0.0
44
ARG REPO=axisecp
55
ARG IMAGE=acap-runtime
6-
ARG UBUNTU_VERSION=22.04
6+
ARG UBUNTU_VERSION=24.04
77

88
FROM ${REPO}/${IMAGE}:${RUNTIME_VERSION}-protofiles AS proto-image
99
FROM arm64v8/ubuntu:${UBUNTU_VERSION} AS runtime-image
@@ -12,6 +12,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
1212
apt-get update && apt-get install -y --no-install-recommends \
1313
python3 \
1414
python3-pip \
15+
python3-venv \
1516
ffmpeg \
1617
libsm6 \
1718
libxext6 \
@@ -20,6 +21,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
2021
# Copy list of grpc dependencies
2122
COPY --from=proto-image /build/requirements.txt .
2223

24+
# Create a virtual environment for installations using pip
25+
RUN python3 -m venv /opt/venv
26+
ENV PATH="/opt/venv/bin:$PATH"
2327
RUN pip install --no-cache-dir -r requirements.txt \
2428
numpy \
2529
opencv-python \

web-server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG UBUNTU_VERSION=22.04
3+
ARG UBUNTU_VERSION=24.04
44

55
FROM arm64v8/ubuntu:${UBUNTU_VERSION} as runtime-image
66

0 commit comments

Comments
 (0)