p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master

Browse Source
This commit is contained in:
GordonTheTurtle
2018-01-23 17:04:13 +00:00
parent 6c6e8038c9 d67508be5d
commit ae55d43f2e
7 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/packaging/Makefile
View File

@ -15,7 +15,7 @@ clean: ## remove build artifacts
$(MAKE) -C static clean
.PHONY: rpm
rpm: DOCKER_BUILD_PKGS:=fedora-27 fedora-26 fedora-25 centos-7
rpm: DOCKER_BUILD_PKGS:=fedora-27 fedora-26 centos-7
rpm: ## build rpm packages
for p in $(DOCKER_BUILD_PKGS); do \
$(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \

1
components/packaging/deb/common/control
View File

@ -14,6 +14,7 @@ Recommends: aufs-tools,
ca-certificates,
cgroupfs-mount | cgroup-lite,
git,
pigz,
xz-utils,
${apparmor:Recommends}
Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine, docker-engine-cs, docker-ee

1
components/packaging/rpm/centos-7/docker-ce.spec
View File

@ -27,6 +27,7 @@ Requires: libcgroup
Requires: systemd-units
Requires: tar
Requires: xz
Requires: pigz
# Resolves: rhbz#1165615
Requires: device-mapper-libs >= 1.02.90-1

17
components/packaging/rpm/fedora-25/Dockerfile.aarch64
View File

@ -1,17 +0,0 @@
FROM arm64v8/fedora:25
RUN dnf -y upgrade
RUN dnf install -y @development-tools fedora-packager
RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel systemd-devel tar git cmake vim-common
ENV GO_VERSION 1.9.2
ENV DISTRO fedora
ENV SUITE 25
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local
ENV GOPATH /go
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
ENV RUNC_BUILDTAGS seccomp selinux
RUN mkdir -p /go/src/github.com/docker && mkdir -p /go/src/github.com/opencontainers
COPY docker-ce.spec /root/rpmbuild/SPECS/docker-ce.spec
WORKDIR /root/rpmbuild
ENTRYPOINT ["/bin/rpmbuild"]

1
components/packaging/rpm/fedora-26/docker-ce.spec
View File

@ -26,6 +26,7 @@ Requires: libcgroup
Requires: systemd-units
Requires: tar
Requires: xz
Requires: pigz
# Resolves: rhbz#1165615
Requires: device-mapper-libs >= 1.02.90-1

1
components/packaging/rpm/fedora-27/docker-ce.spec
View File

@ -27,6 +27,7 @@ Requires: libcgroup
Requires: systemd-units
Requires: tar
Requires: xz
Requires: pigz
# Resolves: rhbz#1165615
Requires: device-mapper-libs >= 1.02.90-1

4
components/packaging/rpm/gen-rpm-ver
View File

@ -39,10 +39,10 @@ if [[ "$rpmVersion" == *-dev ]] || [ -n "$($GIT_COMMAND status --porcelain)" ];
gitUnix="$($GIT_COMMAND log -1 --pretty='%at')"
gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
gitCommit="$($GIT_COMMAND log -1 --pretty='%h')"
gitVersion="${gitDate}.git${gitCommit}"
gitVersion="git${gitDate}.0.${gitCommit}"
# gitVersion is now something like '20150128.112847.17e840a'
rpmVersion="${rpmVersion%-dev}"
rpmRelease="0.0.$gitVersion"
rpmRelease="0.0.dev.$gitVersion"
fi
# Replace any other dashes with periods