Skip to content

Commit 3495677

Browse files
authored
Merge pull request #779 from AkihiroSuda/kinetic
[master] Add Ubuntu 22.10 Kinetic Kudu
2 parents 2884084 + 02217fb commit 3495677

File tree

3 files changed

+42
-1
lines changed

3 files changed

+42
-1
lines changed

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ def pkgs = [
1616
[target: "ubuntu-bionic", image: "ubuntu:bionic", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 18.04 LTS (End of support: April, 2023. EOL: April, 2028)
1717
[target: "ubuntu-focal", image: "ubuntu:focal", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 20.04 LTS (End of support: April, 2025. EOL: April, 2030)
1818
[target: "ubuntu-jammy", image: "ubuntu:jammy", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 22.04 LTS (End of support: April, 2027. EOL: April, 2032)
19+
[target: "ubuntu-kinetic", image: "ubuntu:kinetic", arches: ["amd64", "aarch64", "armhf"]], // Ubuntu 22.10 (EOL: July, 2023)
1920
]
2021

2122
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
47-
UBUNTU_VERSIONS ?= ubuntu-bionic ubuntu-focal ubuntu-jammy
47+
UBUNTU_VERSIONS ?= ubuntu-bionic ubuntu-focal ubuntu-jammy ubuntu-kinetic
4848
RASPBIAN_VERSIONS ?= raspbian-buster raspbian-bullseye
4949
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
5050

deb/ubuntu-kinetic/Dockerfile

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

0 commit comments

Comments
 (0)