Skip to content

Commit d9898f6

Browse files
AkihiroSudathaJeztah
authored andcommitted
Add Ubuntu 24.04 "Noble Numbat"
Signed-off-by: Akihiro Suda <[email protected]>
1 parent 9922aa4 commit d9898f6

File tree

4 files changed

+49
-1
lines changed

4 files changed

+49
-1
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
- debian-bookworm
2222
- ubuntu-focal
2323
- ubuntu-jammy
24+
- ubuntu-noble
2425
steps:
2526
-
2627
name: Checkout

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ def pkgs = [
1818
[target: "ubuntu-focal", image: "ubuntu:focal", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 20.04 LTS (End of support: April, 2025. EOL: April, 2030)
1919
[target: "ubuntu-jammy", image: "ubuntu:jammy", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 22.04 LTS (End of support: June, 2027. EOL: April, 2032)
2020
[target: "ubuntu-mantic", image: "ubuntu:mantic", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 23.10 (EOL: July, 2024)
21+
[target: "ubuntu-noble", image: "ubuntu:noble", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 24.04 LTS (End of support: June, 2029. EOL: April, 2034)
2122
]
2223

2324
def genBuildStep(LinkedHashMap pkg, String arch) {

deb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN?=docker run --rm \
4444
debbuild-$@/$(ARCH)
4545

4646
DEBIAN_VERSIONS ?= debian-buster debian-bullseye debian-bookworm
47-
UBUNTU_VERSIONS ?= ubuntu-focal ubuntu-jammy ubuntu-mantic
47+
UBUNTU_VERSIONS ?= ubuntu-focal ubuntu-jammy ubuntu-mantic ubuntu-noble
4848
RASPBIAN_VERSIONS ?= raspbian-buster raspbian-bullseye raspbian-bookworm
4949
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
5050

deb/ubuntu-noble/Dockerfile

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# syntax=docker/dockerfile:1
2+
3+
ARG GO_IMAGE
4+
ARG DISTRO=ubuntu
5+
ARG SUITE=noble
6+
ARG VERSION_ID=24.04
7+
ARG BUILD_IMAGE=${DISTRO}:${SUITE}
8+
9+
FROM ${GO_IMAGE} AS golang
10+
11+
FROM ${BUILD_IMAGE}
12+
13+
# Remove diverted man binary to prevent man-pages being replaced with "minimized" message. See docker/for-linux#639
14+
RUN if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then \
15+
rm -f /usr/bin/man; \
16+
dpkg-divert --quiet --remove --rename /usr/bin/man; \
17+
fi
18+
19+
ARG DEBIAN_FRONTEND=noninteractive
20+
RUN apt-get update && apt-get install -y curl devscripts equivs git
21+
22+
ENV GOPROXY=https://proxy.golang.org|direct
23+
ENV GO111MODULE=off
24+
ENV GOPATH /go
25+
ENV GOTOOLCHAIN=local
26+
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
27+
28+
ARG COMMON_FILES
29+
COPY --link ${COMMON_FILES} /root/build-deb/debian
30+
RUN apt-get update \
31+
&& mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control
32+
33+
COPY --link sources/ /sources
34+
ARG DISTRO
35+
ARG SUITE
36+
ARG VERSION_ID
37+
ENV DISTRO=${DISTRO}
38+
ENV SUITE=${SUITE}
39+
ENV VERSION_ID=${VERSION_ID}
40+
41+
COPY --link --from=golang /usr/local/go /usr/local/go
42+
43+
WORKDIR /root/build-deb
44+
COPY build-deb /root/build-deb/build-deb
45+
46+
ENTRYPOINT ["/root/build-deb/build-deb"]

0 commit comments

Comments
 (0)