[arch-commits] Commit in docker/trunk (PKGBUILD)
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
===
--- PKGBUILD2020-12-15 22:30:19 UTC (rev 776274)
+++ PKGBUILD2020-12-15 22:30:21 UTC (rev 776275)
@@ -2,8 +2,8 @@
# Maintainer: Morten Linderud
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
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, December 5, 2020 @ 16:41:13
Author: foxboron
Revision: 770912
upgpkg: docker 1:19.03.14-3 - Removed last -ce in version
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-05 15:55:01 UTC (rev 770911)
+++ PKGBUILD2020-12-05 16:41:13 UTC (rev 770912)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=19.03.14
-pkgrel=2
+pkgrel=3
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -105,7 +105,7 @@
_fake_gopath_pushd docker-ce/components/engine github.com/docker/docker
DOCKER_GITCOMMIT=$(cd "$srcdir"/docker-ce && git rev-parse --short HEAD) \
DOCKER_BUILDTAGS='seccomp journald apparmor' \
-VERSION=$pkgver-ce \
+VERSION=$pkgver \
hack/make.sh dynbinary
_fake_gopath_popd
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, December 5, 2020 @ 15:54:51
Author: foxboron
Revision: 770910
upgpkg: docker 1:19.03.14-2 - Fixed FS#68833
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-05 15:46:10 UTC (rev 770909)
+++ PKGBUILD2020-12-05 15:54:51 UTC (rev 770910)
@@ -1,8 +1,9 @@
# Maintainer: Sébastien "Seblu" Luttringer
+# Maintainer: Morten Linderud
pkgname=docker
pkgver=19.03.14
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -83,7 +84,7 @@
### cli
echo 'Building cli'
_fake_gopath_pushd docker-ce/components/cli github.com/docker/cli
- DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=$pkgver-ce dynbinary
+ DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=$pkgver dynbinary
_fake_gopath_popd
### app cli plugin
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, December 1, 2020 @ 23:41:37
Author: foxboron
Revision: 767233
upgpkg: docker 1:19.03.14-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-01 23:07:40 UTC (rev 767232)
+++ PKGBUILD2020-12-01 23:41:37 UTC (rev 767233)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.13
+pkgver=19.03.14
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -17,8 +17,10 @@
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=026aabaa659832804b01754aaadd2c0f420c68b6
+_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;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, September 26, 2020 @ 12:37:25
Author: seblu
Revision: 712458
upgpkg: docker 1:19.03.13-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-09-26 12:29:37 UTC (rev 712457)
+++ PKGBUILD2020-09-26 12:37:25 UTC (rev 712458)
@@ -1,8 +1,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.12
-pkgrel=2
+pkgver=19.03.13
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, July 18, 2020 @ 01:32:42
Author: seblu
Revision: 664390
upgpkg: docker 1:19.03.12-2
- fix FS#66914
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-17 21:08:51 UTC (rev 664389)
+++ PKGBUILD2020-07-18 01:32:42 UTC (rev 664390)
@@ -2,7 +2,7 @@
pkgname=docker
pkgver=19.03.12
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -36,7 +36,7 @@
'541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
prepare() {
- sed -i 's,/var/run,/run,'
docker-ce/components/engine/contrib/init/systemd/docker.socket
+ sed -i 's,/var/run,/run,'
docker-ce/components/packaging/systemd/docker.socket
}
# create a fake go path directory and pushd into it
@@ -135,15 +135,17 @@
install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
### init
install -Dm755 tini/tini-static "$pkgdir/usr/bin/docker-init"
+ ### 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
- # systemd
- install -Dm644 'contrib/init/systemd/docker.service' \
-"$pkgdir/usr/lib/systemd/system/docker.service"
- install -Dm644 'contrib/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" \
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, July 1, 2020 @ 17:13:09
Author: lfleischer
Revision: 657365
upgpkg: docker 1:19.03.12-1: upstream update
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-07-01 17:12:51 UTC (rev 657364)
+++ PKGBUILD2020-07-01 17:13:09 UTC (rev 657365)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.11
+pkgver=19.03.12
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=153d0769a1181bf591a9637fd487a541ec7db1e6
+_LIBNETWORK_COMMIT=026aabaa659832804b01754aaadd2c0f420c68b6
_APP_TAG='v0.9.1-beta3'
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, June 2, 2020 @ 15:14:23
Author: seblu
Revision: 638087
upgpkg: docker 1:19.03.11-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-02 14:44:52 UTC (rev 638086)
+++ PKGBUILD2020-06-02 15:14:23 UTC (rev 638087)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.10
+pkgver=19.03.11
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=71d4d82a5ce50453b1121d95544f0a2ae95bef9b
+_LIBNETWORK_COMMIT=153d0769a1181bf591a9637fd487a541ec7db1e6
_APP_TAG='v0.9.1-beta3'
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, May 29, 2020 @ 15:39:26
Author: seblu
Revision: 637113
upgpkg: docker 1:19.03.10-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-29 15:37:47 UTC (rev 637112)
+++ PKGBUILD2020-05-29 15:39:26 UTC (rev 637113)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.9
+pkgver=19.03.10
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -18,8 +18,8 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=0941c3f409260d5f05cfa6fc68420d8ad45ee483
-_APP_TAG='v0.9.0-beta1'
+_LIBNETWORK_COMMIT=71d4d82a5ce50453b1121d95544f0a2ae95bef9b
+_APP_TAG='v0.9.1-beta3'
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD docker.sysusers)
Date: Tuesday, May 19, 2020 @ 22:24:57
Author: seblu
Revision: 630290
upgpkg: docker 1:19.03.9-1
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.sysusers
-+
PKGBUILD|8
docker.sysusers |1 -
2 files changed, 4 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-19 22:24:15 UTC (rev 630289)
+++ PKGBUILD2020-05-19 22:24:57 UTC (rev 630290)
@@ -1,8 +1,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.8
-pkgrel=2
+pkgver=19.03.9
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=9fd385be8302dbe1071a3ce124891893ff27f90f
+_LIBNETWORK_COMMIT=0941c3f409260d5f05cfa6fc68420d8ad45ee483
_APP_TAG='v0.9.0-beta1'
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
@@ -33,7 +33,7 @@
'SKIP'
'SKIP'
'SKIP'
-'a7a4b52000ed38ead62665eec9ed2366a4f763d61977ebd5414b041ff1c3d415')
+'541826011a9836d05a2f42293d5f1beadf2ca8d89fb604487d61a013505678eb')
prepare() {
sed -i 's,/var/run,/run,'
docker-ce/components/engine/contrib/init/systemd/docker.socket
Modified: docker.sysusers
===
--- docker.sysusers 2020-05-19 22:24:15 UTC (rev 630289)
+++ docker.sysusers 2020-05-19 22:24:57 UTC (rev 630290)
@@ -1,2 +1 @@
-# create docker group (FS#38029)
g docker - -
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, April 2, 2020 @ 00:21:24
Author: seblu
Revision: 609345
upgpkg: docker 1:19.03.8-2
Implement FS#63502. Big thanks to G. Richard Bellamy (rbellamy).
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 28 +---
1 file changed, 25 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-04-01 23:59:51 UTC (rev 609344)
+++ PKGBUILD2020-04-02 00:21:24 UTC (rev 609345)
@@ -2,7 +2,7 @@
pkgname=docker
pkgver=19.03.8
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -19,16 +19,21 @@
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
_LIBNETWORK_COMMIT=9fd385be8302dbe1071a3ce124891893ff27f90f
+_APP_TAG='v0.9.0-beta1'
source=("git+https://github.com/docker/docker-ce.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;
"$pkgname.sysusers")
-sha224sums=('SKIP'
+sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
-'4c19a66617d73adf1c0b4b0a63e22cba296fd5af32b9b32a9787ff8d')
+'SKIP'
+'SKIP'
+'a7a4b52000ed38ead62665eec9ed2366a4f763d61977ebd5414b041ff1c3d415')
prepare() {
sed -i 's,/var/run,/run,'
docker-ce/components/engine/contrib/init/systemd/docker.socket
@@ -79,6 +84,19 @@
DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=$pkgver-ce dynbinary
_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
@@ -149,6 +167,10 @@
# man
install -dm755 "$pkgdir/usr/share/man"
cp -r man/man* "$pkgdir/usr/share/man"
+ # 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"
}
# vim:set ts=2 sw=2 et:
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, March 17, 2020 @ 22:40:53 Author: seblu Revision: 600423 upgpkg: docker 1:19.03.8-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-03-17 22:35:51 UTC (rev 600422) +++ PKGBUILD2020-03-17 22:40:53 UTC (rev 600423) @@ -1,7 +1,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=19.03.7 +pkgver=19.03.8 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, March 6, 2020 @ 12:55:27 Author: seblu Revision: 590963 upgpkg: docker 1:19.03.7-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-03-06 12:39:38 UTC (rev 590962) +++ PKGBUILD2020-03-06 12:55:27 UTC (rev 590963) @@ -1,7 +1,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=19.03.6 +pkgver=19.03.7 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, February 14, 2020 @ 12:40:57
Author: seblu
Revision: 570996
upgpkg: docker 1:19.03.6-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-02-14 12:18:41 UTC (rev 570995)
+++ PKGBUILD2020-02-14 12:40:57 UTC (rev 570996)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.5
+pkgver=19.03.6
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=3eb39382bfa6a3c42f83674ab080ae13b0e34e5d
+_LIBNETWORK_COMMIT=9fd385be8302dbe1071a3ce124891893ff27f90f
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, January 29, 2020 @ 14:36:46
Author: lfleischer
Revision: 558945
docker: do not use makepkg subroutines
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-01-29 14:35:48 UTC (rev 558944)
+++ PKGBUILD2020-01-29 14:36:46 UTC (rev 558945)
@@ -50,7 +50,7 @@
build() {
### check my mistakes on commit version
- msg2 'Checking commit mismatch'
+ echo 'Checking commit mismatch'
(
local _cfile
for _cfile in tini proxy; do
@@ -62,7 +62,7 @@
_pkgbuild=_${_commit}_COMMIT
_dockerfile=${_commit}_COMMIT
if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
- error "Invalid $_commit commit, should be ${!_dockerfile}"
+ echo "Invalid $_commit commit, should be ${!_dockerfile}" >&2
err=$(($err + 1))
fi
done
@@ -74,13 +74,13 @@
export PATH="$GOPATH/bin:$PATH"
### cli
- msg2 'Building cli'
+ echo 'Building cli'
_fake_gopath_pushd docker-ce/components/cli github.com/docker/cli
DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=$pkgver-ce dynbinary
_fake_gopath_popd
### daemon
- msg2 'Building 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) \
DOCKER_BUILDTAGS='seccomp journald apparmor' \
@@ -89,7 +89,7 @@
_fake_gopath_popd
### docker man pages
- msg2 'Building 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
@@ -98,13 +98,13 @@
_fake_gopath_popd
### docker proxy
- msg2 'Building 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
_fake_gopath_popd
### docker-init
- msg2 'Building docker-init'
+ echo 'Building docker-init'
_fake_gopath_pushd tini github.com/krallin/tini
cmake .
# we must use the static binary because it's started in a foreign os
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, November 15, 2019 @ 12:30:22 Author: seblu Revision: 529170 upgpkg: docker 1:19.03.5-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-11-15 12:29:06 UTC (rev 529169) +++ PKGBUILD2019-11-15 12:30:22 UTC (rev 529170) @@ -1,7 +1,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=19.03.4 +pkgver=19.03.5 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, October 19, 2019 @ 04:44:54
Author: seblu
Revision: 517273
upgpkg: docker 1:19.03.4-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-19 03:07:57 UTC (rev 517272)
+++ PKGBUILD2019-10-19 04:44:54 UTC (rev 517273)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.3
+pkgver=19.03.4
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -10,7 +10,7 @@
license=('Apache')
depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'systemd-libs'
'libseccomp' 'libtool' 'runc' 'containerd')
-makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd' 'go-md2man')
+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.
@@ -18,18 +18,21 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=45c710223c5fbf04dc3028b9a90b51892e36ca7f
+_LIBNETWORK_COMMIT=3eb39382bfa6a3c42f83674ab080ae13b0e34e5d
source=("git+https://github.com/docker/docker-ce.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;
"$pkgname.sysusers")
-md5sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '9a8b2744db23b14ca3cd350fdf73c179')
+sha224sums=('SKIP'
+'SKIP'
+'SKIP'
+'SKIP'
+'4c19a66617d73adf1c0b4b0a63e22cba296fd5af32b9b32a9787ff8d')
+prepare() {
+ sed -i 's,/var/run,/run,'
docker-ce/components/engine/contrib/init/systemd/docker.socket
+}
# create a fake go path directory and pushd into it
# $1 real directory
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, October 9, 2019 @ 02:39:36
Author: seblu
Revision: 514322
upgpkg: docker 1:19.03.3-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-09 01:46:52 UTC (rev 514321)
+++ PKGBUILD2019-10-09 02:39:36 UTC (rev 514322)
@@ -1,8 +1,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.2
-pkgrel=2
+pkgver=19.03.3
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=fc5a7d91d54cc98f64fc28f9e288b46a0bee756c
+_LIBNETWORK_COMMIT=45c710223c5fbf04dc3028b9a90b51892e36ca7f
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
@@ -117,7 +117,7 @@
### engine
cd "$srcdir"/docker-ce/components/engine
# binary
- install -Dm755 {bundles/latest/dynbinary-daemon,"$pkgdir"/usr/bin}/dockerd
+ install -Dm755 {bundles/dynbinary-daemon,"$pkgdir"/usr/bin}/dockerd
# systemd
install -Dm644 'contrib/init/systemd/docker.service' \
"$pkgdir/usr/lib/systemd/system/docker.service"
@@ -135,7 +135,7 @@
### cli
cd "$srcdir"/docker-ce/components/cli
# binary
- install -Dm755 build/docker "$pkgdir/usr/bin/docker"
+ install -Dm755 {build,"$pkgdir"/usr/bin}/docker
# completion
install -Dm644 'contrib/completion/bash/docker' \
"$pkgdir/usr/share/bash-completion/completions/docker"
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, October 6, 2019 @ 15:32:57
Author: seblu
Revision: 513438
upgpkg: docker 1:19.03.2-2
- FS#61744
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-10-06 15:32:35 UTC (rev 513437)
+++ PKGBUILD2019-10-06 15:32:57 UTC (rev 513438)
@@ -2,7 +2,7 @@
pkgname=docker
pkgver=19.03.2
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -80,7 +80,7 @@
msg2 'Building daemon'
_fake_gopath_pushd docker-ce/components/engine github.com/docker/docker
DOCKER_GITCOMMIT=$(cd "$srcdir"/docker-ce && git rev-parse --short HEAD) \
-DOCKER_BUILDTAGS='seccomp journald' \
+DOCKER_BUILDTAGS='seccomp journald apparmor' \
VERSION=$pkgver-ce \
hack/make.sh dynbinary
_fake_gopath_popd
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, September 4, 2019 @ 02:17:32
Author: seblu
Revision: 507991
upgpkg: docker 1:19.03.2-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-09-04 01:46:22 UTC (rev 507990)
+++ PKGBUILD2019-09-04 02:17:32 UTC (rev 507991)
@@ -1,8 +1,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=19.03.1
-pkgrel=2
+pkgver=19.03.2
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, August 16, 2019 @ 14:04:56
Author: felixonmars
Revision: 499871
upgpkg: docker 1:19.03.1-2
golang 1.12.8 security rebuild
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-08-16 14:00:19 UTC (rev 499870)
+++ PKGBUILD2019-08-16 14:04:56 UTC (rev 499871)
@@ -2,7 +2,7 @@
pkgname=docker
pkgver=19.03.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, July 27, 2019 @ 22:37:03
Author: seblu
Revision: 493318
upgpkg: docker 1:19.03.1-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-27 20:46:17 UTC (rev 493317)
+++ PKGBUILD2019-07-27 22:37:03 UTC (rev 493318)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.09.8
+pkgver=19.03.1
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=e7933d41e7b206756115aa9df5e0599fc5169742
+_LIBNETWORK_COMMIT=fc5a7d91d54cc98f64fc28f9e288b46a0bee756c
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
@@ -54,14 +54,16 @@
.
"$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
error "Invalid $_commit commit, should be ${!_dockerfile}"
- return 1
+ err=$(($err + 1))
fi
done
+ return $err
)
### globals
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, July 18, 2019 @ 13:14:28 Author: seblu Revision: 491527 upgpkg: docker 1:18.09.8-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-07-18 13:09:18 UTC (rev 491526) +++ PKGBUILD2019-07-18 13:14:28 UTC (rev 491527) @@ -1,7 +1,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=18.09.7 +pkgver=18.09.8 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, July 2, 2019 @ 10:20:22
Author: seblu
Revision: 487246
upgpkg: docker 1:18.09.7-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-07-02 10:08:22 UTC (rev 487245)
+++ PKGBUILD2019-07-02 10:20:22 UTC (rev 487246)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.09.6
+pkgver=18.09.7
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=872f0a83c98add6cae255c8859e29532febc0039
+_LIBNETWORK_COMMIT=e7933d41e7b206756115aa9df5e0599fc5169742
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, May 11, 2019 @ 06:37:20
Author: seblu
Revision: 465148
upgpkg: docker 1:18.09.6-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-05-11 06:00:14 UTC (rev 465147)
+++ PKGBUILD2019-05-11 06:37:20 UTC (rev 465148)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.09.5
+pkgver=18.09.6
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=4725f2163fb214a6312f3beae5991f838ec36326
+_LIBNETWORK_COMMIT=872f0a83c98add6cae255c8859e29532febc0039
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, April 12, 2019 @ 09:34:29 Author: seblu Revision: 451223 upgpkg: docker 1:18.09.5-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-04-12 09:04:52 UTC (rev 451222) +++ PKGBUILD2019-04-12 09:34:29 UTC (rev 451223) @@ -1,7 +1,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=18.09.4 +pkgver=18.09.5 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, March 28, 2019 @ 12:23:44
Author: seblu
Revision: 445268
upgpkg: docker 1:18.09.4-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-28 12:20:11 UTC (rev 445267)
+++ PKGBUILD2019-03-28 12:23:44 UTC (rev 445268)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.09.3
+pkgver=18.09.4
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=2cfbf9b1f98162a55829a21cc603c76072a75382
+_LIBNETWORK_COMMIT=4725f2163fb214a6312f3beae5991f838ec36326
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, February 28, 2019 @ 23:13:51 Author: seblu Revision: 437151 upgpkg: docker 1:18.09.3-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-02-28 21:53:48 UTC (rev 437150) +++ PKGBUILD2019-02-28 23:13:51 UTC (rev 437151) @@ -1,7 +1,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=18.09.2 +pkgver=18.09.3 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, February 12, 2019 @ 00:03:53
Author: anthraxx
Revision: 431834
upgpkg: docker 1:18.09.2-1 (security update)
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-02-11 23:42:48 UTC (rev 431833)
+++ PKGBUILD2019-02-12 00:03:53 UTC (rev 431834)
@@ -1,8 +1,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.09.1
-pkgrel=2
+pkgver=18.09.2
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, February 10, 2019 @ 18:22:15
Author: eschwartz
Revision: 431636
upgpkg: docker 1:18.09.1-2
golang staticlibs rebuild
Fixes CVE-2019-6486 which affects all packages relying on 'crypto/elliptic'
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-02-10 18:20:53 UTC (rev 431635)
+++ PKGBUILD2019-02-10 18:22:15 UTC (rev 431636)
@@ -2,7 +2,7 @@
pkgname=docker
pkgver=18.09.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, January 10, 2019 @ 07:02:28
Author: seblu
Revision: 421515
upgpkg: docker 1:18.09.1-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-01-10 06:49:34 UTC (rev 421514)
+++ PKGBUILD2019-01-10 07:02:28 UTC (rev 421515)
@@ -1,8 +1,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.09.0
-pkgrel=2
+pkgver=18.09.1
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -18,7 +18,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=6da50d1978302f04c3e2089e29112ea24812f05b
+_LIBNETWORK_COMMIT=2cfbf9b1f98162a55829a21cc603c76072a75382
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, November 9, 2018 @ 00:26:34
Author: bpiotrowski
Revision: 404229
1:18.09.0-2: use containerd and runc from [community]
Also use go-md2man from repositories instead of building it separately.
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 44 +---
1 file changed, 5 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-11-09 00:25:28 UTC (rev 404228)
+++ PKGBUILD2018-11-09 00:26:34 UTC (rev 404229)
@@ -2,7 +2,7 @@
pkgname=docker
pkgver=18.09.0
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -9,35 +9,25 @@
url='https://www.docker.com/'
license=('Apache')
depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'libsystemd'
- 'libseccomp' 'libtool')
-makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd')
+ 'libseccomp' 'libtool' 'runc' 'containerd')
+makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd' 'go-md2man')
optdepends=('btrfs-progs: btrfs backend support'
-'lxc: lxc backend support'
'pigz: parallel gzip compressor support')
-conflicts=('containerd' 'runc')
# 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/
-_RUNC_COMMIT=69663f0bd4b60df09991c08812a60108003fa340
-_CONTAINERD_COMMIT=468a545b9edcd5932818eb9de8e72413e616e86e
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
_LIBNETWORK_COMMIT=6da50d1978302f04c3e2089e29112ea24812f05b
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
-"git+https://github.com/opencontainers/runc.git#commit=$_RUNC_COMMIT;
-
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
"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/cpuguy83/go-md2man.git;
"$pkgname.sysusers")
md5sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
'9a8b2744db23b14ca3cd350fdf73c179')
@@ -60,11 +50,11 @@
msg2 'Checking commit mismatch'
(
local _cfile
- for _cfile in runc containerd tini proxy; do
+ for _cfile in tini proxy; do
.
"$srcdir/docker-ce/components/engine/hack/dockerfile/install/$_cfile.installer"
done
local _commit _pkgbuild _dockerfile
- for _commit in RUNC CONTAINERD LIBNETWORK TINI; do
+ for _commit in LIBNETWORK TINI; do
_pkgbuild=_${_commit}_COMMIT
_dockerfile=${_commit}_COMMIT
if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
@@ -93,12 +83,6 @@
hack/make.sh dynbinary
_fake_gopath_popd
- ### go-md2man (used for manpages)
- msg2 'Building go-md2man'
- _fake_gopath_pushd go-md2man github.com/cpuguy83/go-md2man
- go get -v ./...
- _fake_gopath_popd
-
### docker man pages
msg2 'Building man pages'
mkdir -p src/github.com/spf13
@@ -108,18 +92,6 @@
make manpages 2>/dev/null
_fake_gopath_popd
- ### runc
- msg2 'Building runc'
- _fake_gopath_pushd runc github.com/opencontainers/runc
- make BUILDTAGS='seccomp'
- _fake_gopath_popd
-
- ### containerd
- msg2 'Building containerd'
- _fake_gopath_pushd containerd github.com/containerd/containerd
- make
- _fake_gopath_popd
-
### docker proxy
msg2 'Building docker-proxy'
_fake_gopath_pushd libnetwork github.com/docker/libnetwork
@@ -136,12 +108,6 @@
}
package() {
- ### runc
- install -Dm755 runc/runc "$pkgdir/usr/bin/runc"
- ### containerd
- install -Dm755 {containerd,"$pkgdir"/usr}/bin/containerd
- install -Dm755 {containerd,"$pkgdir"/usr}/bin/containerd-shim
- install -Dm755 {containerd,"$pkgdir"/usr}/bin/ctr
### proxy
install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
### init
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, November 8, 2018 @ 19:55:17
Author: seblu
Revision: 404153
upgpkg: docker 1:18.09.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 16
1 file changed, 8 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-11-08 19:33:44 UTC (rev 404152)
+++ PKGBUILD2018-11-08 19:55:17 UTC (rev 404153)
@@ -1,7 +1,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.06.1
+pkgver=18.09.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -14,6 +14,7 @@
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support'
'pigz: parallel gzip compressor support')
+conflicts=('containerd' 'runc')
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip' '!buildflags')
# Use exact commit version from Dockerfile, see them in:
@@ -21,8 +22,8 @@
_RUNC_COMMIT=69663f0bd4b60df09991c08812a60108003fa340
_CONTAINERD_COMMIT=468a545b9edcd5932818eb9de8e72413e616e86e
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
-_LIBNETWORK_COMMIT=3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b
-source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
+_LIBNETWORK_COMMIT=6da50d1978302f04c3e2089e29112ea24812f05b
+source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver;
"git+https://github.com/opencontainers/runc.git#commit=$_RUNC_COMMIT;
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
@@ -136,12 +137,11 @@
package() {
### runc
- install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc"
+ install -Dm755 runc/runc "$pkgdir/usr/bin/runc"
### containerd
- install -Dm755 containerd/bin/containerd "$pkgdir/usr/bin/docker-containerd"
- install -Dm755 containerd/bin/containerd-shim \
-"$pkgdir/usr/bin/docker-containerd-shim"
- install -Dm755 containerd/bin/ctr "$pkgdir/usr/bin/docker-containerd-ctr"
+ install -Dm755 {containerd,"$pkgdir"/usr}/bin/containerd
+ install -Dm755 {containerd,"$pkgdir"/usr}/bin/containerd-shim
+ install -Dm755 {containerd,"$pkgdir"/usr}/bin/ctr
### proxy
install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
### init
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, September 7, 2018 @ 11:32:47
Author: seblu
Revision: 378600
upgpkg: docker 1:18.06.1-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-09-07 09:47:27 UTC (rev 378599)
+++ PKGBUILD2018-09-07 11:32:47 UTC (rev 378600)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.06.0
+pkgver=18.06.1
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -20,7 +20,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_RUNC_COMMIT=69663f0bd4b60df09991c08812a60108003fa340
-_CONTAINERD_COMMIT=d64c661f1d51c48782c9cec8fda7604785f93587
+_CONTAINERD_COMMIT=468a545b9edcd5932818eb9de8e72413e616e86e
_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
_LIBNETWORK_COMMIT=3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, August 19, 2018 @ 09:53:08
Author: seblu
Revision: 372765
upgpkg: docker 1:18.06.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-08-19 09:50:45 UTC (rev 372764)
+++ PKGBUILD2018-08-19 09:53:08 UTC (rev 372765)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.05.0
-pkgrel=2
+pkgver=18.06.0
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -19,10 +19,10 @@
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/
-_RUNC_COMMIT=4fc53a81fb7c994640722ac585fa9ca548971871
-_CONTAINERD_COMMIT=773c489c9c1b21a6d78b5c538cd395416ec50f88
-_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
-_LIBNETWORK_COMMIT=c15b372ef22125880d378167dde44f4b134e1a77
+_RUNC_COMMIT=69663f0bd4b60df09991c08812a60108003fa340
+_CONTAINERD_COMMIT=d64c661f1d51c48782c9cec8fda7604785f93587
+_TINI_COMMIT=fec3683b971d9c3ef73f284f176672c44b448662
+_LIBNETWORK_COMMIT=3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
"git+https://github.com/opencontainers/runc.git#commit=$_RUNC_COMMIT;
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, May 16, 2018 @ 22:36:16
Author: seblu
Revision: 323275
upgpkg: docker 1:18.05.0-2
- fix FS#58477
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-16 22:15:18 UTC (rev 323274)
+++ PKGBUILD2018-05-16 22:36:16 UTC (rev 323275)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=18.05.0
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -13,7 +13,8 @@
'libseccomp' 'libtool')
makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd')
optdepends=('btrfs-progs: btrfs backend support'
-'lxc: lxc backend support')
+'lxc: lxc 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:
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, May 16, 2018 @ 22:15:11
Author: seblu
Revision: 323273
upgpkg: docker 1:18.05.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-05-16 21:51:47 UTC (rev 323272)
+++ PKGBUILD2018-05-16 22:15:11 UTC (rev 323273)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.04.0
+pkgver=18.05.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -21,7 +21,7 @@
_RUNC_COMMIT=4fc53a81fb7c994640722ac585fa9ca548971871
_CONTAINERD_COMMIT=773c489c9c1b21a6d78b5c538cd395416ec50f88
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
-_LIBNETWORK_COMMIT=1b91bc94094ecfdae41daa465cc0c8df37dfb3dd
+_LIBNETWORK_COMMIT=c15b372ef22125880d378167dde44f4b134e1a77
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
"git+https://github.com/opencontainers/runc.git#commit=$_RUNC_COMMIT;
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, April 17, 2018 @ 23:00:42
Author: seblu
Revision: 316838
upgpkg: docker 1:18.04.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-17 22:41:47 UTC (rev 316837)
+++ PKGBUILD2018-04-17 23:00:42 UTC (rev 316838)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.03.0
+pkgver=18.04.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -19,7 +19,7 @@
# Use exact commit version from Dockerfile, see them in:
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
_RUNC_COMMIT=4fc53a81fb7c994640722ac585fa9ca548971871
-_CONTAINERD_COMMIT=cfd04396dc68220d1cecbe686a6cc3aa5ce3667c
+_CONTAINERD_COMMIT=773c489c9c1b21a6d78b5c538cd395416ec50f88
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
_LIBNETWORK_COMMIT=1b91bc94094ecfdae41daa465cc0c8df37dfb3dd
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, March 23, 2018 @ 01:54:31
Author: seblu
Revision: 311131
upgpkg: docker 1:18.03.0-1
- move back to go (see FS#57921)
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 31 ---
1 file changed, 16 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-03-23 00:35:20 UTC (rev 311130)
+++ PKGBUILD2018-03-23 01:54:31 UTC (rev 311131)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.02.0
+pkgver=18.03.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -11,19 +11,17 @@
license=('Apache')
depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'libsystemd'
'libseccomp' 'libtool')
-makedepends=('git' 'go-pie' 'btrfs-progs' 'cmake' 'systemd')
+makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip' '!buildflags')
-# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
-# https://github.com/docker/containerd/issues/299#issuecomment-240745119
-# see commit in hack/dockerfile/binaries-commits
-#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/binaries-commits
-_RUNC_COMMIT=9f9c96235cc97674e935002fc3d78361b696a69e
-_CONTAINERD_COMMIT=9b55aab90508bd389d7654c4baf173a981477d55
+# Use exact commit version from Dockerfile, see them in:
+#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/
+_RUNC_COMMIT=4fc53a81fb7c994640722ac585fa9ca548971871
+_CONTAINERD_COMMIT=cfd04396dc68220d1cecbe686a6cc3aa5ce3667c
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
-_LIBNETWORK_COMMIT=fcf1c3b5e57833756ae3c4140ea54da00319
+_LIBNETWORK_COMMIT=1b91bc94094ecfdae41daa465cc0c8df37dfb3dd
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
"git+https://github.com/opencontainers/runc.git#commit=$_RUNC_COMMIT;
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
@@ -59,18 +57,21 @@
build() {
### check my mistakes on commit version
msg2 'Checking commit mismatch'
- local _cfile _commit _pkgbuild _dockerfile
- _cfile="$srcdir"/docker-ce/components/engine/hack/dockerfile/binaries-commits
- . "$_cfile"
+ (
+ local _cfile
+ for _cfile in runc containerd tini proxy; do
+.
"$srcdir/docker-ce/components/engine/hack/dockerfile/install/$_cfile.installer"
+ done
+ local _commit _pkgbuild _dockerfile
for _commit in RUNC CONTAINERD LIBNETWORK TINI; do
_pkgbuild=_${_commit}_COMMIT
_dockerfile=${_commit}_COMMIT
if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
- error "Invalid $_commit commit"
- fgrep '_COMMIT=' "$_cfile"
+ error "Invalid $_commit commit, should be ${!_dockerfile}"
return 1
fi
done
+ )
### globals
export GOPATH="$srcdir"
@@ -115,7 +116,7 @@
### containerd
msg2 'Building containerd'
_fake_gopath_pushd containerd github.com/containerd/containerd
- LDFLAGS= make
+ make
_fake_gopath_popd
### docker proxy
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, February 13, 2018 @ 16:13:35
Author: seblu
Revision: 293871
upgpkg: docker 1:18.02.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-02-13 15:53:42 UTC (rev 293870)
+++ PKGBUILD2018-02-13 16:13:35 UTC (rev 293871)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=18.01.0
+pkgver=18.02.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -20,10 +20,10 @@
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/binaries-commits
-_RUNC_COMMIT=b2567b37d7b75eb4cf325b77297b140ea686ce8f
-_CONTAINERD_COMMIT=89623f28b87a6004d4b785663257362d1658a729
+_RUNC_COMMIT=9f9c96235cc97674e935002fc3d78361b696a69e
+_CONTAINERD_COMMIT=9b55aab90508bd389d7654c4baf173a981477d55
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
-_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
+_LIBNETWORK_COMMIT=fcf1c3b5e57833756ae3c4140ea54da00319
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
"git+https://github.com/opencontainers/runc.git#commit=$_RUNC_COMMIT;
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Monday, January 15, 2018 @ 00:06:13 Author: seblu Revision: 282283 upgpkg: docker 1:18.01.0-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-01-15 00:05:59 UTC (rev 282282) +++ PKGBUILD2018-01-15 00:06:13 UTC (rev 282283) @@ -2,7 +2,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=17.12.0 +pkgver=18.01.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, December 29, 2017 @ 12:32:53
Author: seblu
Revision: 276853
upgpkg: docker 1:17.12.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-12-29 09:35:05 UTC (rev 276852)
+++ PKGBUILD2017-12-29 12:32:53 UTC (rev 276853)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.11.0
+pkgver=17.12.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -20,8 +20,8 @@
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/binaries-commits
-_RUNC_COMMIT=0351df1c5a66838d0c392b4ac4cf9450de844e2d
-_CONTAINERD_COMMIT=992280e8e265f491f7a624ab82f3e238be086e49
+_RUNC_COMMIT=b2567b37d7b75eb4cf325b77297b140ea686ce8f
+_CONTAINERD_COMMIT=89623f28b87a6004d4b785663257362d1658a729
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, December 10, 2017 @ 10:21:46
Author: seblu
Revision: 273564
upgpkg: docker 1:17.11.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-12-10 09:48:20 UTC (rev 273563)
+++ PKGBUILD2017-12-10 10:21:46 UTC (rev 273564)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.10.0
-pkgrel=2
+pkgver=17.11.0
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -21,7 +21,7 @@
# see commit in hack/dockerfile/binaries-commits
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/binaries-commits
_RUNC_COMMIT=0351df1c5a66838d0c392b4ac4cf9450de844e2d
-_CONTAINERD_COMMIT=06b9cb35161009dcb7123345749fef02f7cea8e0
+_CONTAINERD_COMMIT=992280e8e265f491f7a624ab82f3e238be086e49
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, November 19, 2017 @ 19:39:59
Author: bpiotrowski
Revision: 267488
1:17.10.0-2: go-pie rebuild
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-11-19 19:39:21 UTC (rev 267487)
+++ PKGBUILD2017-11-19 19:39:59 UTC (rev 267488)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=17.10.0
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -11,7 +11,7 @@
license=('Apache')
depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'libsystemd'
'libseccomp' 'libtool')
-makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd')
+makedepends=('git' 'go-pie' 'btrfs-progs' 'cmake' 'systemd')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, October 18, 2017 @ 23:42:57
Author: seblu
Revision: 263318
upgpkg: docker 1:17.10.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-10-18 23:07:11 UTC (rev 263317)
+++ PKGBUILD2017-10-18 23:42:57 UTC (rev 263318)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.09.0
+pkgver=17.10.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -20,12 +20,12 @@
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/binaries-commits
-_RUNC_COMMIT=3f2f8b84a77f73d38244dd690525642a72156c64
+_RUNC_COMMIT=0351df1c5a66838d0c392b4ac4cf9450de844e2d
_CONTAINERD_COMMIT=06b9cb35161009dcb7123345749fef02f7cea8e0
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
-"git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT;
+"git+https://github.com/opencontainers/runc.git#commit=$_RUNC_COMMIT;
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
@@ -79,7 +79,7 @@
### cli
msg2 'Building cli'
_fake_gopath_pushd docker-ce/components/cli github.com/docker/cli
- make VERSION=$pkgver-ce dynbinary
+ DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=$pkgver-ce dynbinary
_fake_gopath_popd
### daemon
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, October 5, 2017 @ 10:51:35
Author: seblu
Revision: 261668
upgpkg: docker 1:17.09.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-10-05 10:51:32 UTC (rev 261667)
+++ PKGBUILD2017-10-05 10:51:35 UTC (rev 261668)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.07.0
+pkgver=17.09.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -20,13 +20,13 @@
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/binaries-commits
-_RUNC_COMMIT=2d41c047c83e09a6d61d464906feb2a2f3c52aa4
-_CONTAINERD_COMMIT=3addd840653146c90a254301d6c3a663c7fd6429
+_RUNC_COMMIT=3f2f8b84a77f73d38244dd690525642a72156c64
+_CONTAINERD_COMMIT=06b9cb35161009dcb7123345749fef02f7cea8e0
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
"git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT;
-
"git+https://github.com/docker/containerd.git#commit=$_CONTAINERD_COMMIT;
+
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
"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;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, August 30, 2017 @ 22:52:28
Author: seblu
Revision: 254992
upgpkg: docker 1:17.07.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-08-30 22:49:21 UTC (rev 254991)
+++ PKGBUILD2017-08-30 22:52:28 UTC (rev 254992)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.06.1
+pkgver=17.07.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -20,8 +20,8 @@
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/binaries-commits
-_RUNC_COMMIT=810190ceaa507aa2727d7ae6f4790c76ec150bd2
-_CONTAINERD_COMMIT=6e23458c129b551d5c9871e5174f6b1b7f6d1170
+_RUNC_COMMIT=2d41c047c83e09a6d61d464906feb2a2f3c52aa4
+_CONTAINERD_COMMIT=3addd840653146c90a254301d6c3a663c7fd6429
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, August 23, 2017 @ 22:56:57
Author: seblu
Revision: 253113
upgpkg: docker 1:17.06.1-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 56
1 file changed, 28 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-08-23 22:36:24 UTC (rev 253112)
+++ PKGBUILD2017-08-23 22:56:57 UTC (rev 253113)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.06.0
-pkgrel=2
+pkgver=17.06.1
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64' 'i686')
@@ -11,7 +11,7 @@
license=('Apache')
depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'libsystemd'
'libseccomp' 'libtool')
-makedepends=('git' 'go' 'btrfs-progs' 'cmake')
+makedepends=('git' 'go' 'btrfs-progs' 'cmake' 'systemd')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
@@ -19,15 +19,14 @@
# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
-_RUNC_COMMIT=2d41c047c83e09a6d61d464906feb2a2f3c52aa4
-_CONTAINERD_COMMIT=cfb82a876ecc11b5ca0977d1733adbe58599088a
+#
https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/binaries-commits
+_RUNC_COMMIT=810190ceaa507aa2727d7ae6f4790c76ec150bd2
+_CONTAINERD_COMMIT=6e23458c129b551d5c9871e5174f6b1b7f6d1170
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
-_DOCKERCLI_COMMIT=3dfb8343b139d6342acfd9975d7f1068b5b1c3d3
source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
-"git+https://github.com/docker/cli.git#commit=$_DOCKERCLI_COMMIT;
"git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT;
-
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
+
"git+https://github.com/docker/containerd.git#commit=$_CONTAINERD_COMMIT;
"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;
@@ -40,7 +39,6 @@
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
'9a8b2744db23b14ca3cd350fdf73c179')
@@ -64,7 +62,7 @@
local _cfile _commit _pkgbuild _dockerfile
_cfile="$srcdir"/docker-ce/components/engine/hack/dockerfile/binaries-commits
. "$_cfile"
- for _commit in DOCKERCLI RUNC CONTAINERD LIBNETWORK TINI; do
+ for _commit in RUNC CONTAINERD LIBNETWORK TINI; do
_pkgbuild=_${_commit}_COMMIT
_dockerfile=${_commit}_COMMIT
if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
@@ -80,7 +78,7 @@
### cli
msg2 'Building cli'
- _fake_gopath_pushd cli github.com/docker/cli
+ _fake_gopath_pushd docker-ce/components/cli github.com/docker/cli
make VERSION=$pkgver-ce dynbinary
_fake_gopath_popd
@@ -88,7 +86,7 @@
msg2 'Building daemon'
_fake_gopath_pushd docker-ce/components/engine github.com/docker/docker
DOCKER_GITCOMMIT=$(cd "$srcdir"/docker-ce && git rev-parse --short HEAD) \
-DOCKER_BUILDTAGS='seccomp' \
+DOCKER_BUILDTAGS='seccomp journald' \
VERSION=$pkgver-ce \
hack/make.sh dynbinary
_fake_gopath_popd
@@ -136,8 +134,6 @@
}
package() {
- ### cli
- install -Dm755 cli/build/docker "$pkgdir/usr/bin/docker"
### runc
install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc"
### containerd
@@ -149,18 +145,11 @@
install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
### init
install -Dm755 tini/tini-static "$pkgdir/usr/bin/docker-init"
- ### docker-ce engine subdir
- cd docker-ce/components/engine
- ### daemon
+ ### engine
+ cd "$srcdir"/docker-ce/components/engine
+ # binary
install -Dm755 {bundles/latest/dynbinary-daemon,"$pkgdir"/usr/bin}/dockerd
- ### 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"
- ### systemd
+ # systemd
install -Dm644 'contrib/init/systemd/docker.service' \
"$pkgdir/usr/lib/systemd/system/docker.service"
install -Dm644 'contrib/init/systemd/docker.socket' \
@@ -169,14 +158,25 @@
"$pkgdir/usr/lib/udev/rules.d/80-docker.rules"
install -Dm644 "$srcdir/$pkgname.sysusers" \
"$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
- ### vim syntax
+ # vim syntax
install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, July 26, 2017 @ 18:07:49
Author: pierre
Revision: 246491
upgpkg: docker 1:17.06.0-2
FS#54870: Add missing libtool dependency
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-07-26 17:49:01 UTC (rev 246490)
+++ PKGBUILD2017-07-26 18:07:49 UTC (rev 246491)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=17.06.0
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64' 'i686')
@@ -10,7 +10,7 @@
url='https://www.docker.com/'
license=('Apache')
depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'libsystemd'
- 'libseccomp')
+ 'libseccomp' 'libtool')
makedepends=('git' 'go' 'btrfs-progs' 'cmake')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, July 8, 2017 @ 21:26:46
Author: seblu
Revision: 243369
upgpkg: docker 1:17.06.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 111 +++--
1 file changed, 65 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-07-08 21:21:28 UTC (rev 243368)
+++ PKGBUILD2017-07-08 21:26:46 UTC (rev 243369)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.05.0
+pkgver=17.06.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -15,15 +15,17 @@
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
-options=('!strip')
+options=('!strip' '!buildflags')
# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
-_RUNC_COMMIT=9c2d8d184e5da67c95d601382adf14862e4f2228
-_CONTAINERD_COMMIT=9048e5e50717ea4497b757314bad98ea3763c145
+_RUNC_COMMIT=2d41c047c83e09a6d61d464906feb2a2f3c52aa4
+_CONTAINERD_COMMIT=cfb82a876ecc11b5ca0977d1733adbe58599088a
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
-source=("git+https://github.com/moby/moby.git#tag=v$pkgver-ce;
+_DOCKERCLI_COMMIT=3dfb8343b139d6342acfd9975d7f1068b5b1c3d3
+source=("git+https://github.com/docker/docker-ce.git#tag=v$pkgver-ce;
+"git+https://github.com/docker/cli.git#commit=$_DOCKERCLI_COMMIT;
"git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT;
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
@@ -38,15 +40,31 @@
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
'9a8b2744db23b14ca3cd350fdf73c179')
+
+# create a fake go path directory and pushd into it
+# $1 real directory
+# $2 gopath directory
+_fake_gopath_pushd() {
+ mkdir -p "$GOPATH/src/${2%/*}"
+ rm -f "$GOPATH/src/$2"
+ ln -rsT "$1" "$GOPATH/src/$2"
+ pushd "$GOPATH/src/$2" >/dev/null
+}
+
+_fake_gopath_popd() {
+ popd >/dev/null
+}
+
build() {
### check my mistakes on commit version
msg2 'Checking commit mismatch'
local _cfile _commit _pkgbuild _dockerfile
- _cfile="$srcdir"/moby/hack/dockerfile/binaries-commits
+ _cfile="$srcdir"/docker-ce/components/engine/hack/dockerfile/binaries-commits
. "$_cfile"
- for _commit in RUNC CONTAINERD LIBNETWORK TINI; do
+ for _commit in DOCKERCLI RUNC CONTAINERD LIBNETWORK TINI; do
_pkgbuild=_${_commit}_COMMIT
_dockerfile=${_commit}_COMMIT
if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
@@ -56,84 +74,85 @@
fi
done
- ### go magics
+ ### globals
export GOPATH="$srcdir"
export PATH="$GOPATH/bin:$PATH"
- ### docker binary
- msg2 'Building docker'
- # projects still reference import with github.com/docker
- mkdir -p src/github.com/docker
- ln -rsfT moby src/github.com/docker/docker
- pushd src/github.com/docker/docker >/dev/null
- DOCKER_BUILDTAGS='seccomp' hack/make.sh dynbinary
- popd >/dev/null
+ ### cli
+ msg2 'Building cli'
+ _fake_gopath_pushd cli github.com/docker/cli
+ make VERSION=$pkgver-ce dynbinary
+ _fake_gopath_popd
+ ### daemon
+ msg2 'Building daemon'
+ _fake_gopath_pushd docker-ce/components/engine github.com/docker/docker
+ DOCKER_GITCOMMIT=$(cd "$srcdir"/docker-ce && git rev-parse --short HEAD) \
+DOCKER_BUILDTAGS='seccomp' \
+VERSION=$pkgver-ce \
+hack/make.sh dynbinary
+ _fake_gopath_popd
+
### go-md2man (used for manpages)
msg2 'Building go-md2man'
- mkdir -p src/github.com/cpuguy83
- ln -rsf go-md2man src/github.com/cpuguy83
- pushd src/github.com/cpuguy83/go-md2man >/dev/null
+ _fake_gopath_pushd go-md2man github.com/cpuguy83/go-md2man
go get -v ./...
- popd >/dev/null
+ _fake_gopath_popd
### docker man pages
msg2 'Building man pages'
- # cobra (used for manpages)
mkdir -p src/github.com/spf13
- ln -rsf cobra src/github.com/spf13
- # generate
- pushd src/github.com/docker/docker >/dev/null
- man/generate.sh 2>/dev/null
- popd >/dev/null
+ 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
### runc
msg2 'Building runc'
- pushd runc >/dev/null
+ _fake_gopath_pushd runc github.com/opencontainers/runc
make BUILDTAGS='seccomp'
- popd >/dev/null
+ _fake_gopath_popd
### containerd
msg2 'Building containerd'
- ln -rsfT containerd src/github.com/docker/containerd
- pushd src/github.com/docker/containerd
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, May 5, 2017 @ 21:01:57
Author: seblu
Revision: 227177
upgpkg: docker 1:17.05.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 156 ++---
1 file changed, 89 insertions(+), 67 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-05-05 20:52:21 UTC (rev 227176)
+++ PKGBUILD2017-05-05 21:01:57 UTC (rev 227177)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.04.0
+pkgver=17.05.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -11,7 +11,7 @@
license=('Apache')
depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'libsystemd'
'libseccomp')
-makedepends=('git' 'go' 'btrfs-progs' 'go-md2man' 'cmake')
+makedepends=('git' 'go' 'btrfs-progs' 'cmake')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
@@ -20,14 +20,16 @@
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
_RUNC_COMMIT=9c2d8d184e5da67c95d601382adf14862e4f2228
-_CONTAINERD_COMMIT=422e31ce907fd9c3833a38d7b8fdd023e5a76e73
+_CONTAINERD_COMMIT=9048e5e50717ea4497b757314bad98ea3763c145
+_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
-_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
-source=("git+https://github.com/docker/docker.git#tag=v$pkgver-ce;
+source=("git+https://github.com/moby/moby.git#tag=v$pkgver-ce;
"git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT;
-
"git+https://github.com/docker/containerd.git#commit=$_CONTAINERD_COMMIT;
+
"git+https://github.com/containerd/containerd.git#commit=$_CONTAINERD_COMMIT;
"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/cpuguy83/go-md2man.git;
"$pkgname.sysusers")
md5sums=('SKIP'
'SKIP'
@@ -34,26 +36,15 @@
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
+ 'SKIP'
'9a8b2744db23b14ca3cd350fdf73c179')
-prepare() {
- cd docker
- # apply patch from the source array (should be a pacman feature)
- local filename
- for filename in "${source[@]}"; do
-if [[ "$filename" =~ \.patch$ ]]; then
- msg2 "Applying patch ${filename##*/}"
- patch -p1 -N -i "$srcdir/${filename##*/}"
-fi
- done
- :
-}
-
build() {
- # check packager mistake on commit version
+ ### check my mistakes on commit version
msg2 'Checking commit mismatch'
local _cfile _commit _pkgbuild _dockerfile
- _cfile="$srcdir"/docker/hack/dockerfile/binaries-commits
+ _cfile="$srcdir"/moby/hack/dockerfile/binaries-commits
. "$_cfile"
for _commit in RUNC CONTAINERD LIBNETWORK TINI; do
_pkgbuild=_${_commit}_COMMIT
@@ -65,77 +56,108 @@
fi
done
- # go
+ ### go magics
export GOPATH="$srcdir"
+ export PATH="$GOPATH/bin:$PATH"
- # runc
+ ### docker binary
+ msg2 'Building docker'
+ # projects still reference import with github.com/docker
+ mkdir -p src/github.com/docker
+ ln -rsfT moby src/github.com/docker/docker
+ pushd src/github.com/docker/docker >/dev/null
+ DOCKER_BUILDTAGS='seccomp' hack/make.sh dynbinary
+ popd >/dev/null
+
+ ### go-md2man (used for manpages)
+ msg2 'Building go-md2man'
+ mkdir -p src/github.com/cpuguy83
+ ln -rsf go-md2man src/github.com/cpuguy83
+ pushd src/github.com/cpuguy83/go-md2man >/dev/null
+ go get -v ./...
+ popd >/dev/null
+
+ ### docker man pages
+ msg2 'Building man pages'
+ # cobra (used for manpages)
+ mkdir -p src/github.com/spf13
+ ln -rsf cobra src/github.com/spf13
+ # generate
+ pushd src/github.com/docker/docker >/dev/null
+ man/generate.sh 2>/dev/null
+ popd >/dev/null
+
+ ### runc
msg2 'Building runc'
- mkdir -p src/github.com/opencontainers
- ln -rsf "$srcdir/runc" src/github.com/opencontainers/runc
- cd src/github.com/opencontainers/runc
+ pushd runc >/dev/null
make BUILDTAGS='seccomp'
+ popd >/dev/null
- # containerd
+ ### containerd
msg2 'Building containerd'
- cd "$srcdir"
- mkdir -p src/github.com/docker
- ln -rsf containerd src/github.com/docker
- cd src/github.com/docker/containerd
+ ln -rsfT containerd src/github.com/docker/containerd
+ pushd src/github.com/docker/containerd >/dev/null
LDFLAGS= make
+ popd >/dev/null
- # docker proxy
+ ### docker proxy
msg2 'Building docker-proxy'
- cd "$srcdir"
ln -rsf libnetwork src/github.com/docker
- cd src/github.com/docker/libnetwork
+ pushd src/github.com/docker/libnetwork >/dev/null
go build -ldflags='-linkmode=external'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, April 8, 2017 @ 17:51:20
Author: seblu
Revision: 221376
upgpkg: docker 1:17.04.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-04-08 15:25:07 UTC (rev 221375)
+++ PKGBUILD2017-04-08 17:51:20 UTC (rev 221376)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.03.1
+pkgver=17.04.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -9,7 +9,8 @@
arch=('x86_64' 'i686')
url='https://www.docker.com/'
license=('Apache')
-depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd'
'libseccomp')
+depends=('glibc' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite'
'libsystemd'
+ 'libseccomp')
makedepends=('git' 'go' 'btrfs-progs' 'go-md2man' 'cmake')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
@@ -18,9 +19,9 @@
# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
-_RUNC_COMMIT=54296cf40ad8143b62dbcaa1d90e520a2136ddfe
-_CONTAINERD_COMMIT=4ab9917febca54791c5f071a9d1f404867857fcc
-_LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
+_RUNC_COMMIT=9c2d8d184e5da67c95d601382adf14862e4f2228
+_CONTAINERD_COMMIT=422e31ce907fd9c3833a38d7b8fdd023e5a76e73
+_LIBNETWORK_COMMIT=7b2b1feb1de4817d522cc372af149ff48d25028e
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
source=("git+https://github.com/docker/docker.git#tag=v$pkgver-ce;
"git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT;
@@ -87,7 +88,7 @@
cd "$srcdir"
ln -rsf libnetwork src/github.com/docker
cd src/github.com/docker/libnetwork
- go build github.com/docker/libnetwork/cmd/proxy
+ go build -ldflags='-linkmode=external' github.com/docker/libnetwork/cmd/proxy
# docker-init
msg2 'Building docker-init'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, March 31, 2017 @ 23:27:12
Author: seblu
Revision: 220188
upgpkg: docker 1:17.03.1-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-31 21:10:40 UTC (rev 220187)
+++ PKGBUILD2017-03-31 23:27:12 UTC (rev 220188)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=17.03.0
+pkgver=17.03.1
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -18,8 +18,8 @@
# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
-_RUNC_COMMIT=a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
-_CONTAINERD_COMMIT=977c511eda0925a723debdc94d09459af49d082a
+_RUNC_COMMIT=54296cf40ad8143b62dbcaa1d90e520a2136ddfe
+_CONTAINERD_COMMIT=4ab9917febca54791c5f071a9d1f404867857fcc
_LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
source=("git+https://github.com/docker/docker.git#tag=v$pkgver-ce;
@@ -51,13 +51,15 @@
build() {
# check packager mistake on commit version
msg2 'Checking commit mismatch'
- . "$srcdir"/docker/hack/dockerfile/binaries-commits
- local _commit _pkgbuild _dockerfile
+ local _cfile _commit _pkgbuild _dockerfile
+ _cfile="$srcdir"/docker/hack/dockerfile/binaries-commits
+ . "$_cfile"
for _commit in RUNC CONTAINERD LIBNETWORK TINI; do
_pkgbuild=_${_commit}_COMMIT
_dockerfile=${_commit}_COMMIT
if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
error "Invalid $_commit commit"
+ fgrep '_COMMIT=' "$_cfile"
return 1
fi
done
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, March 5, 2017 @ 12:50:58
Author: seblu
Revision: 214948
upgpkg: docker 1:17.03.0-1
- upstream release docker-ce
- fix FS#53108
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 32 ++--
1 file changed, 22 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-03-05 11:20:00 UTC (rev 214947)
+++ PKGBUILD2017-03-05 12:50:58 UTC (rev 214948)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.13.1
+pkgver=17.03.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -10,7 +10,7 @@
url='https://www.docker.com/'
license=('Apache')
depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd'
'libseccomp')
-makedepends=('git' 'go' 'btrfs-progs' 'go-md2man')
+makedepends=('git' 'go' 'btrfs-progs' 'go-md2man' 'cmake')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
@@ -18,18 +18,21 @@
# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
# see commit in hack/dockerfile/binaries-commits
-_RUNC_COMMIT=9df8b306d01f59d3a8029be411de015b7304dd8f
-_CONTAINERD_COMMIT=aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1
+_RUNC_COMMIT=a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
+_CONTAINERD_COMMIT=977c511eda0925a723debdc94d09459af49d082a
_LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
-source=("git+https://github.com/docker/docker.git#tag=v$pkgver;
+_TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
+source=("git+https://github.com/docker/docker.git#tag=v$pkgver-ce;
"git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT;
"git+https://github.com/docker/containerd.git#commit=$_CONTAINERD_COMMIT;
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
+"git+https://github.com/krallin/tini.git#commit=$_TINI_COMMIT;
"$pkgname.sysusers")
md5sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
'9a8b2744db23b14ca3cd350fdf73c179')
prepare() {
@@ -50,7 +53,7 @@
msg2 'Checking commit mismatch'
. "$srcdir"/docker/hack/dockerfile/binaries-commits
local _commit _pkgbuild _dockerfile
- for _commit in RUNC CONTAINERD LIBNETWORK; do
+ for _commit in RUNC CONTAINERD LIBNETWORK TINI; do
_pkgbuild=_${_commit}_COMMIT
_dockerfile=${_commit}_COMMIT
if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
@@ -84,6 +87,13 @@
cd src/github.com/docker/libnetwork
go build github.com/docker/libnetwork/cmd/proxy
+ # docker-init
+ msg2 'Building docker-init'
+ cd "$srcdir/tini"
+ cmake .
+ # we must use the static binary because it's started in a foreign os
+ make tini-static
+
# docker
msg2 'Building docker'
cd "$srcdir"/docker
@@ -96,16 +106,18 @@
package() {
# runc
install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc"
- # containerd
+ # docker-containerd
install -Dm755 containerd/bin/containerd "$pkgdir/usr/bin/docker-containerd"
install -Dm755 containerd/bin/containerd-shim
"$pkgdir/usr/bin/docker-containerd-shim"
install -Dm755 containerd/bin/ctr "$pkgdir/usr/bin/docker-containerd-ctr"
- # docker proxy
+ # docker-proxy
install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
+ # docker-init
+ install -Dm755 tini/tini-static "$pkgdir/usr/bin/docker-init"
# docker binary
cd docker
- install -Dm755 "bundles/$pkgver/dynbinary-client/docker-$pkgver"
"$pkgdir/usr/bin/docker"
- install -Dm755 "bundles/$pkgver/dynbinary-daemon/dockerd-$pkgver"
"$pkgdir/usr/bin/dockerd"
+ install -Dm755 "bundles/latest/dynbinary-client/docker"
"$pkgdir/usr/bin/docker"
+ install -Dm755 "bundles/latest/dynbinary-daemon/dockerd"
"$pkgdir/usr/bin/dockerd"
# 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"
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, February 12, 2017 @ 01:47:03
Author: seblu
Revision: 211970
upgpkg: docker 1:1.13.1-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 46 +++---
1 file changed, 35 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-02-12 00:24:44 UTC (rev 211969)
+++ PKGBUILD2017-02-12 01:47:03 UTC (rev 211970)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.12.6
+pkgver=1.13.1
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -17,13 +17,19 @@
options=('!strip')
# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
+# see commit in hack/dockerfile/binaries-commits
+_RUNC_COMMIT=9df8b306d01f59d3a8029be411de015b7304dd8f
+_CONTAINERD_COMMIT=aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1
+_LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
source=("git+https://github.com/docker/docker.git#tag=v$pkgver;
-
'git+https://github.com/opencontainers/runc.git#commit=cc29e3dded8e27ba8f65738f40d251c885030a28'
-
'git+https://github.com/docker/containerd.git#commit=0ac3cd1be170d180b2baed755e8f0da547ceb267'
+"git+https://github.com/docker/runc.git#commit=$_RUNC_COMMIT;
+
"git+https://github.com/docker/containerd.git#commit=$_CONTAINERD_COMMIT;
+
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT;
"$pkgname.sysusers")
md5sums=('SKIP'
'SKIP'
'SKIP'
+ 'SKIP'
'9a8b2744db23b14ca3cd350fdf73c179')
prepare() {
@@ -40,6 +46,20 @@
}
build() {
+ # check packager mistake on commit version
+ msg2 'Checking commit mismatch'
+ . "$srcdir"/docker/hack/dockerfile/binaries-commits
+ local _commit _pkgbuild _dockerfile
+ for _commit in RUNC CONTAINERD LIBNETWORK; do
+_pkgbuild=_${_commit}_COMMIT
+_dockerfile=${_commit}_COMMIT
+if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then
+ error "Invalid $_commit commit"
+ return 1
+fi
+ done
+
+ # go
export GOPATH="$srcdir"
# runc
@@ -57,6 +77,13 @@
cd src/github.com/docker/containerd
LDFLAGS= make
+ # docker proxy
+ msg2 'Building docker-proxy'
+ cd "$srcdir"
+ ln -rsf libnetwork src/github.com/docker
+ cd src/github.com/docker/libnetwork
+ go build github.com/docker/libnetwork/cmd/proxy
+
# docker
msg2 'Building docker'
cd "$srcdir"/docker
@@ -66,21 +93,18 @@
man/md2man-all.sh 2>/dev/null
}
-#check() {
-# cd docker
-# ./hack/make.sh dyntest
-#}
-
package() {
- # runc & containerd
+ # runc
+ install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc"
+ # containerd
install -Dm755 containerd/bin/containerd "$pkgdir/usr/bin/docker-containerd"
install -Dm755 containerd/bin/containerd-shim
"$pkgdir/usr/bin/docker-containerd-shim"
install -Dm755 containerd/bin/ctr "$pkgdir/usr/bin/docker-containerd-ctr"
- install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc"
+ # docker proxy
+ install -Dm755 libnetwork/proxy "$pkgdir/usr/bin/docker-proxy"
# docker binary
cd docker
install -Dm755 "bundles/$pkgver/dynbinary-client/docker-$pkgver"
"$pkgdir/usr/bin/docker"
- install -Dm755 "bundles/$pkgver/dynbinary-daemon/docker-proxy-$pkgver"
"$pkgdir/usr/bin/docker-proxy"
install -Dm755 "bundles/$pkgver/dynbinary-daemon/dockerd-$pkgver"
"$pkgdir/usr/bin/dockerd"
# completion
install -Dm644 'contrib/completion/bash/docker'
"$pkgdir/usr/share/bash-completion/completions/docker"
[arch-commits] Commit in docker/trunk (PKGBUILD docker.install docker.sysusers)
Date: Thursday, January 12, 2017 @ 10:54:56
Author: seblu
Revision: 206979
upgpkg: docker 1:1.12.6-1
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.sysusers
Deleted:
docker/trunk/docker.install
-+
PKGBUILD|5 ++---
docker.install | 13 -
docker.sysusers |1 +
3 files changed, 3 insertions(+), 16 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-01-12 10:50:29 UTC (rev 206978)
+++ PKGBUILD2017-01-12 10:54:56 UTC (rev 206979)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.12.5
+pkgver=1.12.6
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -15,7 +15,6 @@
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip')
-install=$pkgname.install
# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
# https://github.com/docker/containerd/issues/299#issuecomment-240745119
source=("git+https://github.com/docker/docker.git#tag=v$pkgver;
@@ -25,7 +24,7 @@
md5sums=('SKIP'
'SKIP'
'SKIP'
- '8cf9900ebada61f352a03465a088da34')
+ '9a8b2744db23b14ca3cd350fdf73c179')
prepare() {
cd docker
Deleted: docker.install
===
--- docker.install 2017-01-12 10:50:29 UTC (rev 206978)
+++ docker.install 2017-01-12 10:54:56 UTC (rev 206979)
@@ -1,13 +0,0 @@
-# Arg 1: the new package version
-post_install() {
- # create docker group (FS#38029)
- systemd-sysusers docker.conf
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- (( $(vercmp $2 '1:0.7.1-1') < 0 )) && post_install "$1" || true
-}
-
-# vim:set ts=2 sw=2 et:
Modified: docker.sysusers
===
--- docker.sysusers 2017-01-12 10:50:29 UTC (rev 206978)
+++ docker.sysusers 2017-01-12 10:54:56 UTC (rev 206979)
@@ -1 +1,2 @@
+# create docker group (FS#38029)
g docker - -
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, December 28, 2016 @ 21:56:52
Author: seblu
Revision: 203210
upgpkg: docker 1:1.12.5-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-12-28 21:23:33 UTC (rev 203209)
+++ PKGBUILD2016-12-28 21:56:52 UTC (rev 203210)
@@ -2,11 +2,11 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.12.3
+pkgver=1.12.5
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
-arch=('x86_64')
+arch=('x86_64' 'i686')
url='https://www.docker.com/'
license=('Apache')
depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd'
'libseccomp')
@@ -33,8 +33,8 @@
local filename
for filename in "${source[@]}"; do
if [[ "$filename" =~ \.patch$ ]]; then
- msg2 "Applying patch $filename"
- patch -p1 -N -i "$srcdir/$filename"
+ msg2 "Applying patch ${filename##*/}"
+ patch -p1 -N -i "$srcdir/${filename##*/}"
fi
done
:
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, October 27, 2016 @ 17:46:57 Author: seblu Revision: 193787 upgpkg: docker 1:1.12.3-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-10-27 15:55:33 UTC (rev 193786) +++ PKGBUILD2016-10-27 17:46:57 UTC (rev 193787) @@ -2,7 +2,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=1.12.2 +pkgver=1.12.3 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, October 16, 2016 @ 13:27:46 Author: seblu Revision: 192355 upgpkg: docker 1:1.12.2-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-10-16 10:51:22 UTC (rev 192354) +++ PKGBUILD2016-10-16 13:27:46 UTC (rev 192355) @@ -2,7 +2,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=1.12.1 +pkgver=1.12.2 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, August 19, 2016 @ 00:12:00
Author: seblu
Revision: 186983
upgpkg: docker 1:1.12.1-1
- fix FS#50430
- fix FS#49950
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 49 +++--
1 file changed, 39 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-08-19 00:07:55 UTC (rev 186982)
+++ PKGBUILD2016-08-19 00:12:00 UTC (rev 186983)
@@ -2,14 +2,14 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.11.2
-pkgrel=2
+pkgver=1.12.1
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
url='https://www.docker.com/'
license=('Apache')
-depends=('runc' 'containerd' 'bridge-utils' 'iproute2' 'device-mapper'
'sqlite' 'systemd' 'libseccomp')
+depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd'
'libseccomp')
makedepends=('git' 'go' 'btrfs-progs' 'go-md2man')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
@@ -16,9 +16,15 @@
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip')
install=$pkgname.install
+# Use exact commit version from Dockerfile for runc and containerd until 1.0.0
+# https://github.com/docker/containerd/issues/299#issuecomment-240745119
source=("git+https://github.com/docker/docker.git#tag=v$pkgver;
+
'git+https://github.com/opencontainers/runc.git#commit=cc29e3dded8e27ba8f65738f40d251c885030a28'
+
'git+https://github.com/docker/containerd.git#commit=0ac3cd1be170d180b2baed755e8f0da547ceb267'
"$pkgname.sysusers")
md5sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
'8cf9900ebada61f352a03465a088da34')
prepare() {
@@ -35,7 +41,26 @@
}
build() {
- cd docker
+ export GOPATH="$srcdir"
+
+ # runc
+ msg2 'Building runc'
+ mkdir -p src/github.com/opencontainers
+ ln -rsf "$srcdir/runc" src/github.com/opencontainers/runc
+ cd src/github.com/opencontainers/runc
+ make BUILDTAGS='seccomp'
+
+ # containerd
+ msg2 'Building containerd'
+ cd "$srcdir"
+ mkdir -p src/github.com/docker
+ ln -rsf containerd src/github.com/docker
+ cd src/github.com/docker/containerd
+ LDFLAGS= make
+
+ # docker
+ msg2 'Building docker'
+ cd "$srcdir"/docker
export AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp'
hack/make.sh dynbinary
# man pages
@@ -48,13 +73,16 @@
#}
package() {
+ # runc & containerd
+ install -Dm755 containerd/bin/containerd "$pkgdir/usr/bin/docker-containerd"
+ install -Dm755 containerd/bin/containerd-shim
"$pkgdir/usr/bin/docker-containerd-shim"
+ install -Dm755 containerd/bin/ctr "$pkgdir/usr/bin/docker-containerd-ctr"
+ install -Dm755 runc/runc "$pkgdir/usr/bin/docker-runc"
+ # docker binary
cd docker
- install -Dm755 "bundles/$pkgver/dynbinary/docker-$pkgver"
"$pkgdir/usr/bin/docker"
- # symlink containerd/run (nice integration...)
- ln -s containerd "$pkgdir/usr/bin/docker-containerd"
- ln -s containerd-shim "$pkgdir/usr/bin/docker-containerd-shim"
- ln -s ctr "$pkgdir/usr/bin/docker-containerd-ctr"
- ln -s runc "$pkgdir/usr/bin/docker-runc"
+ install -Dm755 "bundles/$pkgver/dynbinary-client/docker-$pkgver"
"$pkgdir/usr/bin/docker"
+ install -Dm755 "bundles/$pkgver/dynbinary-daemon/docker-proxy-$pkgver"
"$pkgdir/usr/bin/docker-proxy"
+ install -Dm755 "bundles/$pkgver/dynbinary-daemon/dockerd-$pkgver"
"$pkgdir/usr/bin/dockerd"
# 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"
@@ -62,6 +90,7 @@
# systemd
install -Dm644 'contrib/init/systemd/docker.service'
"$pkgdir/usr/lib/systemd/system/docker.service"
install -Dm644 'contrib/init/systemd/docker.socket'
"$pkgdir/usr/lib/systemd/system/docker.socket"
+ 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"
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Monday, June 20, 2016 @ 22:45:17
Author: seblu
Revision: 180570
upgpkg: docker 1:1.11.2-2
- Implement FS#49649
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-06-20 22:23:34 UTC (rev 180569)
+++ PKGBUILD2016-06-20 22:45:17 UTC (rev 180570)
@@ -3,13 +3,13 @@
pkgname=docker
pkgver=1.11.2
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
url='https://www.docker.com/'
license=('Apache')
-depends=('runc' 'containerd' 'bridge-utils' 'iproute2' 'device-mapper'
'sqlite' 'systemd')
+depends=('runc' 'containerd' 'bridge-utils' 'iproute2' 'device-mapper'
'sqlite' 'systemd' 'libseccomp')
makedepends=('git' 'go' 'btrfs-progs' 'go-md2man')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
@@ -36,7 +36,7 @@
build() {
cd docker
- export AUTO_GOPATH=1
+ export AUTO_GOPATH=1 DOCKER_BUILDTAGS='seccomp'
hack/make.sh dynbinary
# man pages
man/md2man-all.sh 2>/dev/null
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, June 5, 2016 @ 23:19:28 Author: seblu Revision: 177991 upgpkg: docker 1:1.11.2-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-06-05 21:15:53 UTC (rev 177990) +++ PKGBUILD2016-06-05 21:19:28 UTC (rev 177991) @@ -2,7 +2,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=1.11.1 +pkgver=1.11.2 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Monday, May 2, 2016 @ 22:45:23 Author: seblu Revision: 173456 upgpkg: docker 1:1.11.1-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-05-02 20:01:14 UTC (rev 173455) +++ PKGBUILD2016-05-02 20:45:23 UTC (rev 173456) @@ -2,7 +2,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=1.11.0 +pkgver=1.11.1 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, April 27, 2016 @ 03:18:27
Author: seblu
Revision: 171947
upgpkg: docker 1:1.11.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 12
1 file changed, 8 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 01:17:52 UTC (rev 171946)
+++ PKGBUILD2016-04-27 01:18:27 UTC (rev 171947)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.10.3
+pkgver=1.11.0
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -9,7 +9,7 @@
arch=('x86_64')
url='https://www.docker.com/'
license=('Apache')
-depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
+depends=('runc' 'containerd' 'bridge-utils' 'iproute2' 'device-mapper'
'sqlite' 'systemd')
makedepends=('git' 'go' 'btrfs-progs' 'go-md2man')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
@@ -39,7 +39,7 @@
export AUTO_GOPATH=1
hack/make.sh dynbinary
# man pages
- man/md2man-all.sh
+ man/md2man-all.sh 2>/dev/null
}
#check() {
@@ -50,7 +50,11 @@
package() {
cd docker
install -Dm755 "bundles/$pkgver/dynbinary/docker-$pkgver"
"$pkgdir/usr/bin/docker"
- install -Dm755 "bundles/$pkgver/dynbinary/dockerinit-$pkgver"
"$pkgdir/usr/lib/docker/dockerinit"
+ # symlink containerd/run (nice integration...)
+ ln -s containerd "$pkgdir/usr/bin/docker-containerd"
+ ln -s containerd-shim "$pkgdir/usr/bin/docker-containerd-shim"
+ ln -s ctr "$pkgdir/usr/bin/docker-containerd-ctr"
+ ln -s runc "$pkgdir/usr/bin/docker-runc"
# 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"
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, March 12, 2016 @ 19:27:12
Author: seblu
Revision: 166423
upgpkg: docker 1:1.10.3-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-03-12 18:07:51 UTC (rev 166422)
+++ PKGBUILD2016-03-12 18:27:12 UTC (rev 166423)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.10.2
-pkgrel=2
+pkgver=1.10.3
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -22,8 +22,14 @@
'8cf9900ebada61f352a03465a088da34')
prepare() {
- for _f in "${source[@]}"; do
-[[ "$_f" =~ \.patch$ ]] && { msg2 "$_f"; patch -p1 -d docker < "$_f"; }
+ cd docker
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -i "$srcdir/$filename"
+fi
done
:
}
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, February 25, 2016 @ 09:31:52
Author: seblu
Revision: 163383
upgpkg: docker 1:1.10.2-2
- FS#48329
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-25 08:11:11 UTC (rev 163382)
+++ PKGBUILD2016-02-25 08:31:52 UTC (rev 163383)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.10.2
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, February 23, 2016 @ 01:01:12 Author: seblu Revision: 163154 upgpkg: docker 1:1.10.2-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-02-22 20:52:52 UTC (rev 163153) +++ PKGBUILD2016-02-23 00:01:12 UTC (rev 163154) @@ -2,7 +2,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=1.10.1 +pkgver=1.10.2 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, February 12, 2016 @ 00:55:15
Author: seblu
Revision: 161322
upgpkg: docker 1:1.10.1-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-11 22:51:49 UTC (rev 161321)
+++ PKGBUILD2016-02-11 23:55:15 UTC (rev 161322)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.10.0
-pkgrel=4
+pkgver=1.10.1
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, February 6, 2016 @ 18:07:07
Author: seblu
Revision: 160480
upgpkg: docker 1:1.10.0-4
- fix agian FS#48047
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-06 16:22:19 UTC (rev 160479)
+++ PKGBUILD2016-02-06 17:07:07 UTC (rev 160480)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.10.0
-pkgrel=3
+pkgrel=4
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, February 5, 2016 @ 20:51:21
Author: seblu
Revision: 160426
upgpkg: docker 1:1.10.0-2
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-05 19:51:01 UTC (rev 160425)
+++ PKGBUILD2016-02-05 19:51:21 UTC (rev 160426)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.10.0
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, February 5, 2016 @ 11:56:17
Author: seblu
Revision: 160392
upgpkg: docker 1:1.10.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-05 10:18:19 UTC (rev 160391)
+++ PKGBUILD2016-02-05 10:56:17 UTC (rev 160392)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.9.1
-pkgrel=2
+pkgver=1.10.0
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, January 16, 2016 @ 16:51:05
Author: anthraxx
Revision: 156995
upgpkg: docker 1:1.9.1-2
CVE-2015-8618 security rebuild
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-01-16 15:32:25 UTC (rev 156994)
+++ PKGBUILD2016-01-16 15:51:05 UTC (rev 156995)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.9.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Monday, November 23, 2015 @ 14:56:19 Author: seblu Revision: 147454 upgpkg: docker 1:1.9.1-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-11-23 13:27:07 UTC (rev 147453) +++ PKGBUILD2015-11-23 13:56:19 UTC (rev 147454) @@ -2,7 +2,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=1.9.0 +pkgver=1.9.1 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, November 5, 2015 @ 21:11:00
Author: seblu
Revision: 146049
upgpkg: docker 1:1.9.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-11-05 19:03:46 UTC (rev 146048)
+++ PKGBUILD2015-11-05 20:11:00 UTC (rev 146049)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien "Seblu" Luttringer
pkgname=docker
-pkgver=1.8.3
-pkgrel=2
+pkgver=1.9.0
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -18,16 +18,16 @@
install=$pkgname.install
source=("git+https://github.com/docker/docker.git#tag=v$pkgver;
"$pkgname.sysusers"
-'01-golang15.patch'
'02-fix-unified-cgroup.patch')
md5sums=('SKIP'
'8cf9900ebada61f352a03465a088da34'
- '0511f2bbc52219a960dc91ea9c2d9e44'
'7fd0504057a60e1275b8ce3e06d53c53')
prepare() {
- patch -p1 -d docker < 01-golang15.patch
- patch -p1 -d docker < 02-fix-unified-cgroup.patch
+ for _f in "${source[@]}"; do
+[[ "$_f" =~ \.patch$ ]] && { msg2 "$_f"; patch -p1 -d docker < "$_f"; }
+ done
+ :
}
build() {
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, October 14, 2015 @ 18:35:34 Author: seblu Revision: 143991 upgpkg: docker 1:1.8.3-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-10-14 12:27:18 UTC (rev 143990) +++ PKGBUILD2015-10-14 16:35:34 UTC (rev 143991) @@ -2,7 +2,7 @@ # Maintainer: Sébastien "Seblu" Luttringer pkgname=docker -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD docker.sysusers)
Date: Saturday, August 15, 2015 @ 19:35:09
Author: seblu
Revision: 138389
upgpkg: docker 1:1.8.1-1
- move to dynamic group number
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.sysusers
-+
PKGBUILD|8
docker.sysusers |2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-08-15 17:33:07 UTC (rev 138388)
+++ PKGBUILD2015-08-15 17:35:09 UTC (rev 138389)
@@ -2,12 +2,12 @@
# Maintainer: Sébastien Seblu Luttringer
pkgname=docker
-pkgver=1.7.1
-pkgrel=2
+pkgver=1.8.1
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
-url='http://www.docker.io/'
+url='https://www.docker.com/'
license=('Apache')
depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
makedepends=('git' 'go' 'btrfs-progs' 'go-md2man')
@@ -19,7 +19,7 @@
source=(git+https://github.com/docker/docker.git#tag=v$pkgver;
$pkgname.sysusers)
md5sums=('SKIP'
- '4324edeb9adc210a2c22f44eb4cb8a74')
+ '8cf9900ebada61f352a03465a088da34')
build() {
cd docker
Modified: docker.sysusers
===
--- docker.sysusers 2015-08-15 17:33:07 UTC (rev 138388)
+++ docker.sysusers 2015-08-15 17:35:09 UTC (rev 138389)
@@ -1 +1 @@
-g docker 2 -
+g docker - -
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, July 19, 2015 @ 01:01:40
Author: seblu
Revision: 137107
upgpkg: docker 1:1.7.1-2
- FS#45676
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-07-18 22:34:47 UTC (rev 137106)
+++ PKGBUILD2015-07-18 23:01:40 UTC (rev 137107)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.7.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -41,7 +41,7 @@
# 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/completions/docker.fish
+ install -Dm644 'contrib/completion/fish/docker.fish'
$pkgdir/usr/share/fish/vendor_completions.d/docker.fish
# systemd
install -Dm644 'contrib/init/systemd/docker.service'
$pkgdir/usr/lib/systemd/system/docker.service
install -Dm644 'contrib/init/systemd/docker.socket'
$pkgdir/usr/lib/systemd/system/docker.socket
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, July 15, 2015 @ 02:16:43 Author: seblu Revision: 136930 upgpkg: docker 1:1.7.1-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-07-14 19:38:26 UTC (rev 136929) +++ PKGBUILD2015-07-15 00:16:43 UTC (rev 136930) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, June 19, 2015 @ 09:10:36
Author: seblu
Revision: 135569
upgpkg: docker 1:1.7.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-06-18 21:42:58 UTC (rev 135568)
+++ PKGBUILD2015-06-19 07:10:36 UTC (rev 135569)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien Seblu Luttringer
pkgname=docker
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -24,9 +24,9 @@
build() {
cd docker
export AUTO_GOPATH=1
- ./hack/make.sh dynbinary
+ hack/make.sh dynbinary
# man pages
- docs/man/md2man-all.sh
+ man/md2man-all.sh
}
#check() {
@@ -51,7 +51,7 @@
install -Dm644 'contrib/syntax/vim/ftdetect/dockerfile.vim'
$pkgdir/usr/share/vim/vimfiles/ftdetect/dockerfile.vim
# man
install -dm755 $pkgdir/usr/share/man
- mv docs/man/man* $pkgdir/usr/share/man
+ mv man/man* $pkgdir/usr/share/man
}
# vim:set ts=2 sw=2 et:
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, May 14, 2015 @ 17:41:52
Author: seblu
Revision: 133440
upgpkg: docker 1:1.6.2-2
- implement FS#44256
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-14 15:39:32 UTC (rev 133439)
+++ PKGBUILD2015-05-14 15:41:52 UTC (rev 133440)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.6.2
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -10,7 +10,7 @@
url='http://www.docker.io/'
license=('Apache')
depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
-makedepends=('git' 'go' 'btrfs-progs')
+makedepends=('git' 'go' 'btrfs-progs' 'go-md2man')
optdepends=('btrfs-progs: btrfs backend support'
'lxc: lxc backend support')
# don't strip binaries! A sha1 is used to check binary consistency.
@@ -25,6 +25,8 @@
cd docker
export AUTO_GOPATH=1
./hack/make.sh dynbinary
+ # man pages
+ docs/man/md2man-all.sh
}
#check() {
@@ -47,6 +49,9 @@
# 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
+ # man
+ install -dm755 $pkgdir/usr/share/man
+ mv docs/man/man* $pkgdir/usr/share/man
}
# vim:set ts=2 sw=2 et:
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, May 14, 2015 @ 02:54:14
Author: seblu
Revision: 133384
upgpkg: docker 1:1.6.2-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-13 20:02:22 UTC (rev 133383)
+++ PKGBUILD2015-05-14 00:54:14 UTC (rev 133384)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien Seblu Luttringer
pkgname=docker
-pkgver=1.6.1
+pkgver=1.6.2
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -28,8 +28,7 @@
}
#check() {
-# cd $_magic/docker
-# # Will be added upstream soon
+# cd docker
# ./hack/make.sh dyntest
#}
[arch-commits] Commit in docker/trunk (PKGBUILD docker.install docker.sysusers)
Date: Friday, May 8, 2015 @ 12:35:33
Author: seblu
Revision: 132956
upgpkg: docker 1:1.6.1-1
Added:
docker/trunk/docker.sysusers
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.install
-+
PKGBUILD| 21 ++---
docker.install |9 ++---
docker.sysusers |1 +
3 files changed, 13 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-05-08 10:27:12 UTC (rev 132955)
+++ PKGBUILD2015-05-08 10:35:33 UTC (rev 132956)
@@ -2,7 +2,7 @@
# Maintainer: Sébastien Seblu Luttringer
pkgname=docker
-pkgver=1.6.0
+pkgver=1.6.1
pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -16,8 +16,10 @@
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip')
install=$pkgname.install
-source=(git+https://github.com/docker/docker.git#tag=v$pkgver;)
-md5sums=('SKIP')
+source=(git+https://github.com/docker/docker.git#tag=v$pkgver;
+$pkgname.sysusers)
+md5sums=('SKIP'
+ '4324edeb9adc210a2c22f44eb4cb8a74')
build() {
cd docker
@@ -40,15 +42,12 @@
install -Dm644 'contrib/completion/zsh/_docker'
$pkgdir/usr/share/zsh/site-functions/_docker
install -Dm644 'contrib/completion/fish/docker.fish'
$pkgdir/usr/share/fish/completions/docker.fish
# systemd
- install -Dm644 'contrib/init/systemd/docker.service' \
-$pkgdir/usr/lib/systemd/system/docker.service
- install -Dm644 'contrib/init/systemd/docker.socket' \
-$pkgdir/usr/lib/systemd/system/docker.socket
+ install -Dm644 'contrib/init/systemd/docker.service'
$pkgdir/usr/lib/systemd/system/docker.service
+ install -Dm644 'contrib/init/systemd/docker.socket'
$pkgdir/usr/lib/systemd/system/docker.socket
+ 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 '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
}
# vim:set ts=2 sw=2 et:
Modified: docker.install
===
--- docker.install 2015-05-08 10:27:12 UTC (rev 132955)
+++ docker.install 2015-05-08 10:35:33 UTC (rev 132956)
@@ -1,7 +1,7 @@
-# arg 1: the new package version
+# Arg 1: the new package version
post_install() {
# create docker group (FS#38029)
- getent group docker /dev/null || groupadd -g 142 docker
+ systemd-sysusers docker.conf
}
# arg 1: the new package version
@@ -10,9 +10,4 @@
(( $(vercmp $2 '1:0.7.1-1') 0 )) post_install $1 || true
}
-# arg 1: the old package version
-post_remove() {
- groupdel docker /dev/null 21 || true
-}
-
# vim:set ts=2 sw=2 et:
Added: docker.sysusers
===
--- docker.sysusers (rev 0)
+++ docker.sysusers 2015-05-08 10:35:33 UTC (rev 132956)
@@ -0,0 +1 @@
+g docker 2 -
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Monday, April 20, 2015 @ 00:30:26 Author: seblu Revision: 131731 upgpkg: docker 1:1.6.0-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-04-19 19:52:27 UTC (rev 131730) +++ PKGBUILD2015-04-19 22:30:26 UTC (rev 131731) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.5.0 +pkgver=1.6.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, February 10, 2015 @ 22:28:56 Author: seblu Revision: 127539 upgpkg: docker 1:1.5.0-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-02-10 20:55:09 UTC (rev 127538) +++ PKGBUILD2015-02-10 21:28:56 UTC (rev 127539) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.4.1 +pkgver=1.5.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, December 19, 2014 @ 16:08:46
Author: fyan
Revision: 124105
upgpkg: docker 1:1.4.1-1
upstream new release
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-19 13:58:10 UTC (rev 124104)
+++ PKGBUILD2014-12-19 15:08:46 UTC (rev 124105)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien Seblu Luttringer
pkgname=docker
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, December 13, 2014 @ 22:11:28
Author: bpiotrowski
Revision: 123856
upgpkg: docker 1:1.4.0-2
rebuild with go 1.3 to fix segfaults caused by go 1.4 (FS#43104)
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-12-13 19:42:37 UTC (rev 123855)
+++ PKGBUILD2014-12-13 21:11:28 UTC (rev 123856)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.4.0
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, December 12, 2014 @ 14:52:52 Author: seblu Revision: 123812 upgpkg: docker 1:1.4.0-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-12-12 11:19:25 UTC (rev 123811) +++ PKGBUILD2014-12-12 13:52:52 UTC (rev 123812) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.3.3 +pkgver=1.4.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Thursday, December 11, 2014 @ 21:54:08 Author: seblu Revision: 123790 upgpkg: docker 1:1.3.3-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-12-11 20:06:47 UTC (rev 123789) +++ PKGBUILD2014-12-11 20:54:08 UTC (rev 123790) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, November 25, 2014 @ 23:35:01 Author: seblu Revision: 123114 upgpkg: docker 1:1.3.2-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-11-25 20:10:17 UTC (rev 123113) +++ PKGBUILD2014-11-25 22:35:01 UTC (rev 123114) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, October 31, 2014 @ 01:28:13 Author: seblu Revision: 121609 upgpkg: docker 1:1.3.1-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-10-30 20:13:29 UTC (rev 121608) +++ PKGBUILD2014-10-31 00:28:13 UTC (rev 121609) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, October 17, 2014 @ 00:31:08
Author: seblu
Revision: 120842
upgpkg: docker 1:1.3.0-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-10-16 21:58:26 UTC (rev 120841)
+++ PKGBUILD2014-10-16 22:31:08 UTC (rev 120842)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien Seblu Luttringer
pkgname=docker
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Tuesday, September 23, 2014 @ 23:21:27
Author: seblu
Revision: 119530
upgpkg: docker 1:1.2.0-2
- Fix FS#42072
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-09-23 21:05:41 UTC (rev 119529)
+++ PKGBUILD2014-09-23 21:21:27 UTC (rev 119530)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.2.0
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -38,6 +38,7 @@
# 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/completions/docker.fish
# systemd
install -Dm644 'contrib/init/systemd/docker.service' \
$pkgdir/usr/lib/systemd/system/docker.service
[arch-commits] Commit in docker/trunk (PKGBUILD docker.service)
Date: Sunday, August 24, 2014 @ 00:56:07
Author: seblu
Revision: 117822
upgpkg: docker 1:1.2.0-1
- fix FS#41440
Modified:
docker/trunk/PKGBUILD
Deleted:
docker/trunk/docker.service
+
PKGBUILD | 15 ++-
docker.service | 13 -
2 files changed, 6 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-23 16:16:56 UTC (rev 117821)
+++ PKGBUILD2014-08-23 22:56:07 UTC (rev 117822)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien Seblu Luttringer
pkgname=docker
-pkgver=1.1.2
-pkgrel=2
+pkgver=1.2.0
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -16,10 +16,8 @@
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip')
install=$pkgname.install
-source=(git+https://github.com/docker/docker.git#tag=v$pkgver;
-'docker.service')
-md5sums=('SKIP'
- 'aea0c57d458e3fc313107a76745c96bb')
+source=(git+https://github.com/docker/docker.git#tag=v$pkgver;)
+md5sums=('SKIP')
build() {
cd docker
@@ -41,10 +39,9 @@
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
# systemd
- #install -Dm644 'contrib/init/systemd/socket-activation/docker.service' \
- install -Dm644 $srcdir/docker.service \
+ install -Dm644 'contrib/init/systemd/docker.service' \
$pkgdir/usr/lib/systemd/system/docker.service
- install -Dm644 'contrib/init/systemd/socket-activation/docker.socket' \
+ install -Dm644 'contrib/init/systemd/docker.socket' \
$pkgdir/usr/lib/systemd/system/docker.socket
# vim syntax
install -Dm644 'contrib/syntax/vim/syntax/dockerfile.vim' \
Deleted: docker.service
===
--- docker.service 2014-08-23 16:16:56 UTC (rev 117821)
+++ docker.service 2014-08-23 22:56:07 UTC (rev 117822)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=http://docs.docker.com
-After=network.target docker.socket
-Requires=docker.socket
-
-[Service]
-ExecStart=/usr/bin/docker -d -H fd://
-LimitNOFILE=1048576
-LimitNPROC=1048576
-
-[Install]
-Also=docker.socket
[arch-commits] Commit in docker/trunk (PKGBUILD docker.install docker.service)
Date: Saturday, July 26, 2014 @ 17:08:42
Author: seblu
Revision: 116378
upgpkg: docker 1:1.1.2-2
- fix FS#41338
- remove no more needed transition message
Added:
docker/trunk/docker.service
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.install
+
PKGBUILD | 11 +++
docker.install | 11 ---
docker.service | 13 +
3 files changed, 20 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-26 14:48:46 UTC (rev 116377)
+++ PKGBUILD2014-07-26 15:08:42 UTC (rev 116378)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.1.2
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -16,8 +16,10 @@
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip')
install=$pkgname.install
-source=(git+https://github.com/docker/docker.git#tag=v$pkgver;)
-md5sums=('SKIP')
+source=(git+https://github.com/docker/docker.git#tag=v$pkgver;
+'docker.service')
+md5sums=('SKIP'
+ 'aea0c57d458e3fc313107a76745c96bb')
build() {
cd docker
@@ -39,7 +41,8 @@
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
# systemd
- install -Dm644 'contrib/init/systemd/socket-activation/docker.service' \
+ #install -Dm644 'contrib/init/systemd/socket-activation/docker.service' \
+ install -Dm644 $srcdir/docker.service \
$pkgdir/usr/lib/systemd/system/docker.service
install -Dm644 'contrib/init/systemd/socket-activation/docker.socket' \
$pkgdir/usr/lib/systemd/system/docker.socket
Modified: docker.install
===
--- docker.install 2014-07-26 14:48:46 UTC (rev 116377)
+++ docker.install 2014-07-26 15:08:42 UTC (rev 116378)
@@ -8,7 +8,6 @@
# arg 2: the old package version
post_upgrade() {
(( $(vercmp $2 '1:0.7.1-1') 0 )) post_install $1 || true
- (( $(vercmp $2 '1:1.1.1-2') 0 )) socketactivation || true
}
# arg 1: the old package version
@@ -16,14 +15,4 @@
groupdel docker /dev/null 21 || true
}
-socketactivation() {
- if systemctl -q is-enabled docker; then
-cat EOF
-The docker service switched to socket activation.
-We will enable the socket file for you. Don't need to thanks us.
-EOF
-systemctl enable docker.socket
- fi
-}
-
# vim:set ts=2 sw=2 et:
Added: docker.service
===
--- docker.service (rev 0)
+++ docker.service 2014-07-26 15:08:42 UTC (rev 116378)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.com
+After=network.target docker.socket
+Requires=docker.socket
+
+[Service]
+ExecStart=/usr/bin/docker -d -H fd://
+LimitNOFILE=1048576
+LimitNPROC=1048576
+
+[Install]
+Also=docker.socket
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Friday, July 25, 2014 @ 00:59:05
Author: seblu
Revision: 116314
upgpkg: docker 1:1.1.2-1
Modified:
docker/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-24 22:52:08 UTC (rev 116313)
+++ PKGBUILD2014-07-24 22:59:05 UTC (rev 116314)
@@ -2,8 +2,8 @@
# Maintainer: Sébastien Seblu Luttringer
pkgname=docker
-pkgver=1.1.1
-pkgrel=2
+pkgver=1.1.2
+pkgrel=1
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -16,7 +16,7 @@
# don't strip binaries! A sha1 is used to check binary consistency.
options=('!strip')
install=$pkgname.install
-source=(git+https://github.com/dotcloud/docker.git#tag=v$pkgver;)
+source=(git+https://github.com/docker/docker.git#tag=v$pkgver;)
md5sums=('SKIP')
build() {
[arch-commits] Commit in docker/trunk (PKGBUILD docker.install)
Date: Wednesday, July 23, 2014 @ 01:32:13
Author: seblu
Revision: 116129
fix FS#41289
implement FS#40847
Modified:
docker/trunk/PKGBUILD
docker/trunk/docker.install
+
PKGBUILD | 13 +
docker.install | 11 +++
2 files changed, 20 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-22 23:16:12 UTC (rev 116128)
+++ PKGBUILD2014-07-22 23:32:13 UTC (rev 116129)
@@ -3,7 +3,7 @@
pkgname=docker
pkgver=1.1.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64')
@@ -39,10 +39,15 @@
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
# systemd
- install -Dm644 'contrib/init/systemd/docker.service'
$pkgdir/usr/lib/systemd/system/docker.service
+ install -Dm644 'contrib/init/systemd/socket-activation/docker.service' \
+$pkgdir/usr/lib/systemd/system/docker.service
+ install -Dm644 'contrib/init/systemd/socket-activation/docker.socket' \
+$pkgdir/usr/lib/systemd/system/docker.socket
# 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/dockerfile.vim
+ 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
}
# vim:set ts=2 sw=2 et:
Modified: docker.install
===
--- docker.install 2014-07-22 23:16:12 UTC (rev 116128)
+++ docker.install 2014-07-22 23:32:13 UTC (rev 116129)
@@ -8,6 +8,7 @@
# arg 2: the old package version
post_upgrade() {
(( $(vercmp $2 '1:0.7.1-1') 0 )) post_install $1 || true
+ (( $(vercmp $2 '1:1.1.1-2') 0 )) socketactivation || true
}
# arg 1: the old package version
@@ -15,4 +16,14 @@
groupdel docker /dev/null 21 || true
}
+socketactivation() {
+ if systemctl -q is-enabled docker; then
+cat EOF
+The docker service switched to socket activation.
+We will enable the socket file for you. Don't need to thanks us.
+EOF
+systemctl enable docker.socket
+ fi
+}
+
# vim:set ts=2 sw=2 et:
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Wednesday, July 16, 2014 @ 15:54:16 Author: seblu Revision: 115777 upgpkg: docker 1:1.1.1-1 - fix FS#41208 Modified: docker/trunk/PKGBUILD --+ PKGBUILD | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-07-16 12:44:51 UTC (rev 115776) +++ PKGBUILD2014-07-16 13:54:16 UTC (rev 115777) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container' @@ -36,10 +36,13 @@ install -Dm755 bundles/$pkgver/dynbinary/docker-$pkgver $pkgdir/usr/bin/docker install -Dm755 bundles/$pkgver/dynbinary/dockerinit-$pkgver $pkgdir/usr/lib/docker/dockerinit # 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/bash/docker' $pkgdir/usr/share/bash-completion/completions/docker + install -Dm644 'contrib/completion/zsh/_docker' $pkgdir/usr/share/zsh/site-functions/_docker # systemd - install -Dm644 contrib/init/systemd/docker.service $pkgdir/usr/lib/systemd/system/docker.service + install -Dm644 'contrib/init/systemd/docker.service' $pkgdir/usr/lib/systemd/system/docker.service + # 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/dockerfile.vim } # vim:set ts=2 sw=2 et:
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Sunday, July 6, 2014 @ 00:15:24 Author: seblu Revision: 115150 upgpkg: docker 1:1.1.0-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-07-05 20:26:18 UTC (rev 115149) +++ PKGBUILD2014-07-05 22:15:24 UTC (rev 115150) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.0.1 +pkgver=1.1.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Saturday, June 21, 2014 @ 00:48:31 Author: seblu Revision: 113376 upgpkg: docker 1:1.0.1-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-06-20 17:47:33 UTC (rev 113375) +++ PKGBUILD2014-06-20 22:48:31 UTC (rev 113376) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
[arch-commits] Commit in docker/trunk (PKGBUILD)
Date: Monday, June 9, 2014 @ 16:47:17 Author: seblu Revision: 112919 upgpkg: docker 1:1.0.0-1 Modified: docker/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2014-06-09 14:40:25 UTC (rev 112918) +++ PKGBUILD2014-06-09 14:47:17 UTC (rev 112919) @@ -2,7 +2,7 @@ # Maintainer: Sébastien Seblu Luttringer pkgname=docker -pkgver=0.12.0 +pkgver=1.0.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container'
