Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 782cbb1

Browse files
DeeDeeGthaJeztah
authored andcommitted
Add Ubuntu 20.04 Focal Fossa
Signed-off-by: DeeDeeG <DeeDeeG@users.noreply.github.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 1baf61a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: a0cdb993c9381cc6d814e02190f8235a79238215 Component: packaging
1 parent 3bfab88 commit 782cbb1

3 files changed

Lines changed: 43 additions & 1 deletion

File tree

components/packaging/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ This repository is solely maintained by Docker, Inc.
77

88
The scripts will build for this list of packages types:
99

10+
* DEB packages for Ubuntu 20.04 Focal
1011
* DEB packages for Ubuntu 19.10 Eoan
1112
* DEB packages for Ubuntu 19.04 Disco
1213
* DEB packages for Ubuntu 18.10 Cosmic

components/packaging/deb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ SOURCE_FILES=cli.tgz engine.tgz docker.service docker.socket plugin-installers.t
3939
SOURCES=$(addprefix sources/, $(SOURCE_FILES))
4040

4141
DEBIAN_VERSIONS := debian-stretch debian-buster
42-
UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco ubuntu-eoan
42+
UBUNTU_VERSIONS := ubuntu-xenial ubuntu-bionic ubuntu-cosmic ubuntu-disco ubuntu-eoan ubuntu-focal
4343
RASPBIAN_VERSIONS := raspbian-stretch raspbian-buster
4444
DISTROS := $(DEBIAN_VERSIONS) $(UBUNTU_VERSIONS) $(RASPBIAN_VERSIONS)
4545

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
ARG GO_IMAGE
2+
ARG DISTRO=ubuntu
3+
ARG SUITE=focal
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 mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control
29+
30+
COPY sources/ /sources
31+
ARG DISTRO
32+
ARG SUITE
33+
ENV DISTRO=${DISTRO}
34+
ENV SUITE=${SUITE}
35+
36+
COPY --from=golang /usr/local/go /usr/local/go
37+
38+
WORKDIR /root/build-deb
39+
COPY build-deb /root/build-deb/build-deb
40+
41+
ENTRYPOINT ["/root/build-deb/build-deb"]

0 commit comments

Comments
 (0)