Skip to content

Commit 1157d28

Browse files
committed
kea: update deps
Ubuntu 24.04, kea 2.4, stork 1.15
1 parent 5ca8de3 commit 1157d28

File tree

2 files changed

+339
-260
lines changed

2 files changed

+339
-260
lines changed

kea/Dockerfile

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
# syntax=docker/dockerfile:1
22

3-
ARG BASE=public.ecr.aws/ubuntu/ubuntu:22.04
4-
5-
# `~` is mangled as `.`
6-
ARG KEA_VERSION=2.3.6-1.rk1.jammy
3+
ARG BASE=public.ecr.aws/ubuntu/ubuntu:24.04
74

85
###
96

10-
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/rust:1.69-slim-bullseye as build-healthz
7+
FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/rust:1.77-slim-bullseye as build-healthz
118
RUN rustup target add aarch64-unknown-linux-gnu
129
RUN apt-get update \
1310
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -26,10 +23,10 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
2623
FROM --platform=$BUILDPLATFORM $BASE as build-stork
2724

2825
RUN apt-get update \
29-
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends git rake build-essential wget unzip
26+
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends git rake build-essential wget unzip python3
3027

3128
WORKDIR /build
32-
RUN git clone --depth=1 https://gitlab.isc.org/isc-projects/stork -b v1.10.0
29+
RUN git clone --depth=1 https://gitlab.isc.org/isc-projects/stork -b v1.15.0
3330

3431
WORKDIR /build/stork/backend
3532
ENV GOPATH=/build/go
@@ -54,43 +51,18 @@ RUN jsonnet /tmp/kea-ctrl-agent.jsonnet > /app/kea-ctrl-agent.json
5451

5552
###
5653

57-
FROM --platform=$BUILDPLATFORM $BASE as download
58-
59-
RUN apt-get update \
60-
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
61-
curl \
62-
ca-certificates
63-
64-
ARG KEA_VERSION
65-
66-
WORKDIR /download
67-
RUN curl -SsfL --remote-name-all \
68-
https://github.com/hanazuki/isc-kea.deb/releases/download/debian%2F2.3.6-1_rk1_jammy/{kea-admin_${KEA_VERSION}_arm64.deb,kea-common_${KEA_VERSION}_arm64.deb,kea-ctrl-agent_${KEA_VERSION}_arm64.deb,kea-dhcp4-server_${KEA_VERSION}_arm64.deb}
69-
70-
RUN sha384sum -c --strict <<EOF
71-
3da15d37c3edbaf670400c4221a7d116ebc306c4c573d3f3a6b8ace2ec1fb3782194b118c37a803b6696aa0340f45b17 kea-admin_2.3.6-1.rk1.jammy_arm64.deb
72-
8d4fadc507ce3a98199dceefd71f2da689cab40aa97753bdfb0f2facff0f5c734b968d86809c666dea5f01ec35eb04ac kea-common_2.3.6-1.rk1.jammy_arm64.deb
73-
a735a6e6102defd5fadb20900fb92bbd769368c5c211be3f0f0e9ccab29d2d6e69ad65dd46fed22a016ed0b5a2e74c90 kea-ctrl-agent_2.3.6-1.rk1.jammy_arm64.deb
74-
525e1ba2c96929ce32385d4c240a43ce7c4daf96023810d167b9204ba680517e8557896d40ab1d387de996fce7a84e68 kea-dhcp4-server_2.3.6-1.rk1.jammy_arm64.deb
75-
EOF
76-
77-
###
78-
7954
FROM $BASE
8055

8156
RUN mkdir -p /run/kea /app
8257
VOLUME /run/kea
8358

84-
ARG KEA_VERSION
85-
86-
RUN --mount=type=bind,from=download,src=/download,dst=/download \
87-
apt-get update \
59+
RUN apt-get update \
8860
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
8961
ca-certificates \
9062
dumb-init \
91-
ruby3.0 \
63+
ruby \
9264
iproute2 \
93-
/download/*.deb \
65+
kea \
9466
&& apt-get clean && rm -rf /var/lib/apt/lists/*
9567

9668
COPY --from=build-healthz /app/bin/healthz /app/healthzd

0 commit comments

Comments
 (0)