Skip to content

Commit dda0c67

Browse files
authored
Merge pull request #585 from AkihiroSuda/impish
[master] Add Ubuntu 21.10 "Impish Indri"
2 parents 3a9994e + a0b4eed commit dda0c67

File tree

3 files changed

+44
-2
lines changed

3 files changed

+44
-2
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test_steps = [
99
try {
1010
checkout scm
1111
sh "make REF=$branch checkout"
12-
sh "make -C deb ubuntu-focal ubuntu-hirsute debian-bullseye"
12+
sh "make -C deb ubuntu-focal ubuntu-hirsute ubuntu-impish debian-bullseye"
1313
} finally {
1414
sh "make clean"
1515
}

deb/Makefile

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

4242
DEBIAN_VERSIONS ?= debian-buster debian-bullseye
43-
UBUNTU_VERSIONS ?= ubuntu-bionic ubuntu-focal ubuntu-hirsute
43+
UBUNTU_VERSIONS ?= ubuntu-bionic ubuntu-focal ubuntu-hirsute ubuntu-impish
4444
RASPBIAN_VERSIONS ?= raspbian-buster raspbian-bullseye
4545
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
4646

deb/ubuntu-impish/Dockerfile

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
ARG GO_IMAGE
2+
ARG DISTRO=ubuntu
3+
ARG SUITE=impish
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=direct
20+
ENV GO111MODULE=off
21+
ENV GOPATH /go
22+
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
23+
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
24+
ENV RUNC_BUILDTAGS apparmor seccomp selinux
25+
26+
ARG COMMON_FILES
27+
COPY ${COMMON_FILES} /root/build-deb/debian
28+
RUN apt-get update \
29+
&& mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control
30+
31+
COPY sources/ /sources
32+
ARG DISTRO
33+
ARG SUITE
34+
ENV DISTRO=${DISTRO}
35+
ENV SUITE=${SUITE}
36+
37+
COPY --from=golang /usr/local/go /usr/local/go
38+
39+
WORKDIR /root/build-deb
40+
COPY build-deb /root/build-deb/build-deb
41+
42+
ENTRYPOINT ["/root/build-deb/build-deb"]

0 commit comments

Comments
 (0)