[arch-commits] Commit in docker/trunk (PKGBUILD)
Morten Linderud
foxboron at archlinux.org
Tue Dec 15 22:30:21 UTC 2020
Date: Tuesday, December 15, 2020 @ 22:30:21
Author: foxboron
Revision: 776275
upgpkg: docker 1:20.10.1-1
Modified:
docker/trunk/PKGBUILD
----------+
PKGBUILD | 145 +++++++++++++++++++++++--------------------------------------
1 file changed, 55 insertions(+), 90 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-12-15 22:30:19 UTC (rev 776274)
+++ PKGBUILD 2020-12-15 22:30:21 UTC (rev 776275)
@@ -2,8 +2,8 @@
# Maintainer: Morten Linderud <foxboron at archlinux.org>
pkgname=docker
-pkgver=19.03.14
-pkgrel=3
+pkgver=20.10.1
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -14,21 +14,17 @@
makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd' 'go-md2man' 'sed')
optdepends=('btrfs-progs: btrfs backend support'
'pigz: parallel gzip compressor support')
-# don't strip binaries! A sha1 is used to check binary consistency.
-options=('!strip' '!buildflags')
-# Use exact commit version from Dockerfile, see them in:
-# https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
-# Note: Don't look at *master*, select the correct tag.
-_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=55e924b8a84231a065879156c0de95aefc5f5435
-# https://github.com/docker/docker-ce/blob/master/components/packaging/plugins/app.installer
-_APP_TAG='v0.9.1-beta3'
-source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver"
+# https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
+_TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
+_LIBNETWORK_COMMIT=5c6a95bfb20c61571a00f913c6b91959ede84e8d
+_BUILDX_COMMIT=11057da37336192bfc57d81e02359ba7ba848e4a
+_APP_COMMIT=9d2c67f87b7338eb1a0fa2f18eb81af3d2aac0e1
+source=("git+https://github.com/docker/cli.git#tag=v$pkgver"
+ "git+https://github.com/moby/moby.git#tag=v$pkgver"
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT"
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT"
- "git+https://github.com/spf13/cobra.git"
- "git+https://github.com/docker/buildx.git"
- "git+https://github.com/docker/app.git#tag=$_APP_TAG"
+ "git+https://github.com/docker/buildx.git#commit=$_BUILDX_COMMIT"
+ "git+https://github.com/docker/app.git#commit=$_APP_COMMIT"
"$pkgname.sysusers")
sha256sums=('SKIP'
'SKIP'
@@ -38,8 +34,10 @@
'SKIP'
'541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
-prepare() {
- sed -i 's,/var/run,/run,' docker-ce/components/packaging/systemd/docker.socket
+prepare(){
+ cd cli
+ sed -i 's/-v md2man/-v go-md2man/' scripts/docs/generate-man.sh
+ sed -i 's/md2man/go-md2man/' man/md2man-all.sh
}
# create a fake go path directory and pushd into it
@@ -57,71 +55,36 @@
}
build() {
- ### check my mistakes on commit version
- echo 'Checking commit mismatch'
- (
- local _cfile
- for _cfile in tini proxy; do
- . "$srcdir/docker-ce/components/engine/hack/dockerfile/install/$_cfile.installer"
- done
- local _commit _pkgbuild _dockerfile
- err=0
- for _commit in LIBNETWORK TINI; do
- _pkgbuild=_${_commit}_COMMIT
- _dockerfile=${_commit}_COMMIT
- if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
- echo "Invalid $_commit commit, should be ${!_dockerfile}" >&2
- err=$(($err + 1))
- fi
- done
- return $err
- )
-
### globals
export GOPATH="$srcdir"
export PATH="$GOPATH/bin:$PATH"
+ export CGO_CPPFLAGS="${CPPFLAGS}"
+ export CGO_CFLAGS="${CFLAGS}"
+ export CGO_CXXFLAGS="${CXXFLAGS}"
+ export CGO_LDFLAGS="${LDFLAGS}"
+ export LDFLAGS=""
+ export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw -ldflags=-linkmode=external"
### cli
echo 'Building cli'
- _fake_gopath_pushd docker-ce/components/cli github.com/docker/cli
+ _fake_gopath_pushd cli github.com/docker/cli
DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=$pkgver dynbinary
+ make manpages
_fake_gopath_popd
- ### app cli plugin
- echo 'Building app cli plugin'
- _fake_gopath_pushd app github.com/docker/app
- make dynamic
- _fake_gopath_popd
-
- ### buildx cli plugin
- echo 'Building buildx cli plugin'
- _fake_gopath_pushd buildx github.com/docker/buildx
- go build -o bin/docker-buildx -ldflags "-X github.com/docker/buildx/version.Version=$(git describe --match 'v[0-9]*' --always --tags)-tp-docker -X github.com/docker/buildx/version.Revision=$(git rev-parse HEAD) -X github.com/docker/buildx/version.Package=github.com/docker/buildx -X main.experimental=1" ./cmd/buildx
- go clean -modcache
- _fake_gopath_popd
-
### daemon
echo 'Building daemon'
- _fake_gopath_pushd docker-ce/components/engine github.com/docker/docker
- DOCKER_GITCOMMIT=$(cd "$srcdir"/docker-ce && git rev-parse --short HEAD) \
+ _fake_gopath_pushd moby github.com/docker/docker
+ DOCKER_GITCOMMIT=$(cd "$srcdir"/moby && git rev-parse --short HEAD) \
DOCKER_BUILDTAGS='seccomp journald apparmor' \
VERSION=$pkgver \
hack/make.sh dynbinary
_fake_gopath_popd
- ### docker man pages
- echo 'Building man pages'
- mkdir -p src/github.com/spf13
- ln -rsfT cobra src/github.com/spf13/cobra
- # use docker-ce cli version because they mess up with man dir
- _fake_gopath_pushd docker-ce/components/cli github.com/docker/cli
- make manpages 2>/dev/null
- _fake_gopath_popd
-
### docker proxy
echo 'Building docker-proxy'
_fake_gopath_pushd libnetwork github.com/docker/libnetwork
- go build -ldflags='-linkmode=external' github.com/docker/libnetwork/cmd/proxy
+ go build github.com/docker/libnetwork/cmd/proxy
_fake_gopath_popd
### docker-init
@@ -131,6 +94,22 @@
# we must use the static binary because it's started in a foreign os
make tini-static
_fake_gopath_popd
+
+ ### app cli plugin
+ echo 'Building app cli plugin'
+ _fake_gopath_pushd app github.com/docker/app
+ make dynamic
+ _fake_gopath_popd
+
+ ### buildx cli plugin
+ echo 'Building buildx cli plugin'
+ _fake_gopath_pushd buildx github.com/docker/buildx
+ go build -o docker-buildx -ldflags "-X github.com/docker/buildx/version.Version=$(git describe --match 'v[0-9]*' --always --tags)-tp-docker \
+ -X github.com/docker/buildx/version.Revision=$(git rev-parse HEAD) \
+ -X github.com/docker/buildx/version.Package=github.com/docker/buildx \
+ -X main.experimental=1 -linkmode=external" ./cmd/buildx
+ _fake_gopath_popd
+
}
package() {
@@ -138,37 +117,23 @@
install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
### init
install -Dm755 tini/tini-static "$pkgdir/usr/bin/docker-init"
+ ### dockerd
+ install -Dm755 moby/bundles/dynbinary-daemon/dockerd "$pkgdir"/usr/bin/dockerd
### systemd units
- cd "$srcdir"/docker-ce/components/packaging
- install -Dm644 'systemd/docker.service' \
- "$pkgdir/usr/lib/systemd/system/docker.service"
- install -Dm644 'systemd/docker.socket' \
- "$pkgdir/usr/lib/systemd/system/docker.socket"
- ### engine
- cd "$srcdir"/docker-ce/components/engine
- # binary
- install -Dm755 {bundles/dynbinary-daemon,"$pkgdir"/usr/bin}/dockerd
+ cd "$srcdir"/moby/contrib
+ install -Dm644 'init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service"
+ install -Dm644 'init/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket"
# systemd rules
- install -Dm644 'contrib/udev/80-docker.rules' \
- "$pkgdir/usr/lib/udev/rules.d/80-docker.rules"
- install -Dm644 "$srcdir/$pkgname.sysusers" \
- "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
- # vim syntax
- install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \
- "$pkgdir/usr/share/vim/vimfiles/syntax/dockerfile.vim"
- install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim' \
- "$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim"
+ install -Dm644 'udev/80-docker.rules' "$pkgdir/usr/lib/udev/rules.d/80-docker.rules"
+ install -Dm644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
### cli
- cd "$srcdir"/docker-ce/components/cli
+ cd "$srcdir"/cli
# binary
- install -Dm755 {build,"$pkgdir"/usr/bin}/docker
+ install -Dm755 build/docker "$pkgdir/usr/bin/docker"
# completion
- install -Dm644 'contrib/completion/bash/docker' \
- "$pkgdir/usr/share/bash-completion/completions/docker"
- install -Dm644 'contrib/completion/zsh/_docker' \
- "$pkgdir/usr/share/zsh/site-functions/_docker"
- install -Dm644 'contrib/completion/fish/docker.fish' \
- "$pkgdir/usr/share/fish/vendor_completions.d/docker.fish"
+ install -Dm644 'contrib/completion/bash/docker' "$pkgdir/usr/share/bash-completion/completions/docker"
+ install -Dm644 'contrib/completion/zsh/_docker' "$pkgdir/usr/share/zsh/site-functions/_docker"
+ install -Dm644 'contrib/completion/fish/docker.fish' "$pkgdir/usr/share/fish/vendor_completions.d/docker.fish"
# man
install -dm755 "$pkgdir/usr/share/man"
cp -r man/man* "$pkgdir/usr/share/man"
@@ -175,7 +140,7 @@
# cli-plugins
cd "$srcdir"/src/github.com/docker
install -Dm755 app/bin/docker-app "$pkgdir/usr/lib/docker/cli-plugins/docker-app"
- install -Dm755 buildx/bin/docker-buildx "$pkgdir/usr/lib/docker/cli-plugins/docker-buildx"
+ install -Dm755 buildx/docker-buildx "$pkgdir/usr/lib/docker/cli-plugins/docker-buildx"
}
# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list