diff --git a/components/packaging/Makefile b/components/packaging/Makefile index 251d42f0a4..0545e2feaf 100644 --- a/components/packaging/Makefile +++ b/components/packaging/Makefile @@ -2,7 +2,6 @@ SHELL:=/bin/bash ENGINE_DIR:=$(CURDIR)/../engine CLI_DIR:=$(CURDIR)/../cli VERSION=unknown -PLUGIN_VERSION=unknown DOCKER_GITCOMMIT:=abcdefg .PHONY: help clean rpm deb static @@ -18,18 +17,17 @@ clean: ## remove build artifacts rpm: DOCKER_BUILD_PKGS:=fedora-26 fedora-25 fedora-24 centos-7 rpm: ## build rpm packages for p in $(DOCKER_BUILD_PKGS); do \ - $(MAKE) -C $@ VERSION=$(VERSION) PLUGIN_VERSION=$(PLUGIN_VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ + $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ done deb: DOCKER_BUILD_PKGS:=ubuntu-zesty ubuntu-xenial ubuntu-trusty debian-stretch debian-wheezy debian-jessie raspbian-stretch raspbian-jessie deb: ## build deb packages - $(MAKE) -C $@ metrics_plugin for p in $(DOCKER_BUILD_PKGS); do \ - $(MAKE) -C $@ VERSION=$(VERSION) PLUGIN_VERSION=$(PLUGIN_VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ + $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ done static: DOCKER_BUILD_PKGS:=static-linux cross-mac cross-win cross-arm static: ## build static-compiled packages for p in $(DOCKER_BUILD_PKGS); do \ - $(MAKE) -C $@ VERSION=$(VERSION) PLUGIN_VERSION=$(PLUGIN_VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ + $(MAKE) -C $@ VERSION=$(VERSION) ENGINE_DIR=$(ENGINE_DIR) CLI_DIR=$(CLI_DIR) $${p}; \ done diff --git a/components/packaging/common/load-telemetry-plugin b/components/packaging/common/load-telemetry-plugin deleted file mode 100755 index 7264c20d27..0000000000 --- a/components/packaging/common/load-telemetry-plugin +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env sh - -BASE=/var/lib/docker -TAR_DIR=$BASE/plugins/tar - -# make sure that the directory exists -mkdir -p $TAR_DIR - -# Create the engine UUID, if it doesn't exist -# This will be eventually handled by the docker engine -# ref. https://github.com/moby/moby/issues/33356 -if [ -f $BASE/engine_uuid ]; then - UUID=$(cat $BASE/engine_uuid) -fi -if [ -z ${UUID+x} ]; then - UUID=$(cat /proc/sys/kernel/random/uuid | tee $BASE/engine_uuid) -fi - -# make sure that docker is running -if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then - DOCKER_SOCKET=/var/run/docker.sock -else - DOCKER_SOCKET=$(printf "%s" "$DOCKER_OPTS" | grep -oP -e '(-H|--host)\W*unix://\K(\S+)' | sed 1q) -fi - -if [ -n "$DOCKER_SOCKET" ]; then - while ! [ -e "$DOCKER_SOCKET" ]; do - sleep 0.1 - done -fi - -# store the metrics plugin state -plugin_name=$(docker plugin ls | grep docker/telemetry | awk 'NR==1{print $2}') -plugin_metadata=$TAR_DIR/.plugin-metadata -if docker inspect $plugin_name > /dev/null 2>&1; then - plugin_state=$(docker plugin inspect $plugin_name | grep -o '"Enabled":.*' | sed 's/,/\\\}/g' | sed 's/ //g') - # remove previous plugin state - sed -i 's/,"Enabled":.*/\}/g' $plugin_metadata - # add new plugin state - sed -i "s/\}/,$plugin_state/g" $plugin_metadata -fi - -# find plugin_name based on the tarball -plugin_filename=$(ls $TAR_DIR/) -plugin_tag=$(echo $plugin_filename | cut -d"_" -f2-) -plugin_tag=${plugin_tag%.tgz} -plugin_name=docker/telemetry:$plugin_tag -# install/upgrade telemetry plugin in case it's not present (ignore stdout/stderror) -if ! docker inspect $plugin_name > /dev/null 2>&1; then - # remove old plugin versions - docker plugin rm -f `docker plugin ls | grep docker/telemetry | awk '{print $2}'` > /dev/null 2>&1 - # create new plugin (disabled by default) - cd $TAR_DIR/ && tar -zxf $plugin_filename -C /tmp - docker plugin create $plugin_name /tmp/plugin > /dev/null 2>&1 - rm -rf /tmp/plugin - # extract all the edition variables, including the engine uuid - uuid=$(cat /var/lib/docker/engine_uuid) - edition_version=$(cat $plugin_metadata | sed 's/{.*edition_version":"*\([0-9a-zA-Z.]*\)"*,*.*}/\1/') - edition_type=$(cat $plugin_metadata | sed 's/{.*edition_type":"*\([0-9a-zA-Z.]*\)"*,*.*}/\1/') - edition_name=$(cat $plugin_metadata | sed 's/{.*edition_name":"*\([0-9a-zA-Z.]*\)"*,*.*}/\1/') - docker plugin set $plugin_name edition_name=$edition_name edition_type=$edition_type edition_version=$edition_version anonymous_id=$uuid > /dev/null 2>&1 - # set the metrics plugin to its previous state - if grep 'true' $plugin_metadata > /dev/null 2>&1 ; then - docker plugin enable $plugin_name > /dev/null 2>&1 - fi -fi diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index f81ff0b615..10754515d8 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -1,14 +1,10 @@ SHELL:=/bin/bash ALPINE_IMG:=$(shell $(CURDIR)/../detect_alpine_image) ARCH:=$(shell uname -m) -KERNEL:=$(shell docker version --format '{{.Server.Os}}') ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli -COMMON_DIR:=$(CURDIR)/../common -PLUGIN_DIR:=$(CURDIR)/plugin GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=$(shell cat $(ENGINE_DIR)/VERSION) -PLUGIN_VERSION?=1.0.0.$(KERNEL)-$(ARCH)-test DOCKER_EXPERIMENTAL:=0 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v $(ALPINE_IMG) chown @@ -29,24 +25,15 @@ debian: debian-stretch debian-wheezy debian-jessie ## build all debian deb packa raspbian: raspbian-stretch debian-jessie ## build all raspbian deb packages -metrics_plugin: ## pull telemetry plugin tarball - mkdir -p $(PLUGIN_DIR) - docker create --name tmp docker/telemetry-tgz:$(PLUGIN_VERSION) - docker export tmp | tar -x -C $(PLUGIN_DIR) - docker rm -f tmp - ubuntu-xenial: ## build ubuntu xenial deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . docker run --rm -i \ -e VERSION=$(VERSION) \ - -e PLUGIN_VERSION=$(PLUGIN_VERSION) \ -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ - -v $(PLUGIN_DIR):/plugin \ -v $(CLI_DIR):/cli \ -v $(CURDIR)/systemd:/root/build-deb/systemd \ - -v $(COMMON_DIR):/root/build-deb/common \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -54,14 +41,11 @@ ubuntu-trusty: ## build ubuntu trusty deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . docker run --rm -i \ -e VERSION=$(VERSION) \ - -e PLUGIN_VERSION=$(PLUGIN_VERSION) \ -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ - -v $(PLUGIN_DIR):/plugin \ -v $(CLI_DIR):/cli \ -v $(CURDIR)/systemd:/root/build-deb/systemd \ - -v $(COMMON_DIR):/root/build-deb/common \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -70,13 +54,10 @@ ubuntu-zesty: ## build ubuntu zesty deb packages docker run --rm -i \ -e VERSION=$(VERSION) \ -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ - -e PLUGIN_VERSION=$(PLUGIN_VERSION) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ - -v $(PLUGIN_DIR):/plugin \ -v $(CLI_DIR):/cli \ -v $(CURDIR)/systemd:/root/build-deb/systemd \ - -v $(COMMON_DIR):/root/build-deb/common \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -85,13 +66,10 @@ debian-jessie: ## build debian jessie deb packages docker run --rm -i \ -e VERSION=$(VERSION) \ -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ - -e PLUGIN_VERSION=$(PLUGIN_VERSION) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ - -v $(PLUGIN_DIR):/plugin \ -v $(CLI_DIR):/cli \ -v $(CURDIR)/systemd:/root/build-deb/systemd \ - -v $(COMMON_DIR):/root/build-deb/common \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -100,13 +78,10 @@ debian-stretch: ## build debian stretch deb packages docker run --rm -i \ -e VERSION=$(VERSION) \ -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ - -e PLUGIN_VERSION=$(PLUGIN_VERSION) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ - -v $(PLUGIN_DIR):/plugin \ -v $(CLI_DIR):/cli \ -v $(CURDIR)/systemd:/root/build-deb/systemd \ - -v $(COMMON_DIR):/root/build-deb/common \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -115,13 +90,10 @@ debian-wheezy: ## build debian wheezy deb packages docker run --rm -i \ -e VERSION=$(VERSION) \ -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ - -e PLUGIN_VERSION=$(PLUGIN_VERSION) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ - -v $(PLUGIN_DIR):/plugin \ -v $(CLI_DIR):/cli \ -v $(CURDIR)/systemd:/root/build-deb/systemd \ - -v $(COMMON_DIR):/root/build-deb/common \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -130,13 +102,10 @@ raspbian-jessie: ## build raspbian jessie deb packages docker run --rm -i \ -e VERSION=$(VERSION) \ -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ - -e PLUGIN_VERSION=$(PLUGIN_VERSION) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ - -v $(PLUGIN_DIR):/plugin \ -v $(CLI_DIR):/cli \ -v $(CURDIR)/systemd:/root/build-deb/systemd \ - -v $(COMMON_DIR):/root/build-deb/common \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -145,12 +114,9 @@ raspbian-stretch: ## build raspbian stretch deb packages docker run --rm -i \ -e VERSION=$(VERSION) \ -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ - -e PLUGIN_VERSION=$(PLUGIN_VERSION) \ -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ - -v $(PLUGIN_DIR):/plugin \ -v $(CLI_DIR):/cli \ -v $(CURDIR)/systemd:/root/build-deb/systemd \ - -v $(COMMON_DIR):/root/build-deb/common \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ diff --git a/components/packaging/deb/common/docker-ce.docker.init b/components/packaging/deb/common/docker-ce.docker.init index 53657ff407..9c8fa6be73 100644 --- a/components/packaging/deb/common/docker-ce.docker.init +++ b/components/packaging/deb/common/docker-ce.docker.init @@ -85,7 +85,7 @@ cgroupfs_mount() { case "$1" in start) check_init - + fail_unless_root cgroupfs_mount @@ -114,8 +114,6 @@ case "$1" in $DOCKER_OPTS \ >> "$DOCKER_LOGFILE" 2>&1 log_end_msg $? - # load metrics plugin (disabled by default) - /usr/bin/load-telemetry-plugin ;; stop) diff --git a/components/packaging/deb/common/docker-ce.docker.upstart b/components/packaging/deb/common/docker-ce.docker.upstart index de6a65fd42..d58f7d6ac8 100644 --- a/components/packaging/deb/common/docker-ce.docker.upstart +++ b/components/packaging/deb/common/docker-ce.docker.upstart @@ -69,6 +69,4 @@ post-start script done echo "$DOCKER_SOCKET is up" fi - # load metrics plugin (disabled by default) - /usr/bin/load-telemetry-plugin end script diff --git a/components/packaging/deb/common/rules b/components/packaging/deb/common/rules index 4d5124e69e..e2962bb78e 100644 --- a/components/packaging/deb/common/rules +++ b/components/packaging/deb/common/rules @@ -11,8 +11,6 @@ override_dh_gencontrol: dh_gencontrol override_dh_auto_build: - # create metrics plugin metadata - printf '{"edition_type":"ce","edition_name":"%s","edition_version":"%s"}\n' "$(DISTRO)" "$(VERSION)" > /plugin/.plugin-metadata cd engine && ./hack/make.sh dynbinary cd /go/src/github.com/docker/cli && LDFLAGS='' make VERSION=$(VERSION) GITCOMMIT=$(DOCKER_GITCOMMIT) dynbinary manpages @@ -33,10 +31,6 @@ override_dh_auto_install: cp -aT /usr/local/bin/docker-runc debian/docker-ce/usr/bin/docker-runc cp -aT /usr/local/bin/docker-init debian/docker-ce/usr/bin/docker-init mkdir -p debian/docker-ce/usr/lib/docker - mkdir -p debian/docker-ce/var/lib/docker/plugins/tar - cp -aTL /plugin/telemetry_$(PLUGIN_VERSION).tgz debian/docker-ce/var/lib/docker/plugins/tar/telemetry_$(PLUGIN_VERSION).tgz - cp -aTL /plugin/.plugin-metadata debian/docker-ce/var/lib/docker/plugins/tar/.plugin-metadata - cp -aTL /root/build-deb/common/load-telemetry-plugin debian/docker-ce/usr/bin/load-telemetry-plugin override_dh_installinit: # use "docker" as our service name, not "docker-ce" diff --git a/components/packaging/deb/systemd/docker.service b/components/packaging/deb/systemd/docker.service index 08494bebf1..517463172b 100644 --- a/components/packaging/deb/systemd/docker.service +++ b/components/packaging/deb/systemd/docker.service @@ -12,7 +12,6 @@ Type=notify # for containers run by docker ExecStart=/usr/bin/dockerd -H fd:// ExecReload=/bin/kill -s HUP $MAINPID -ExecStartPost=/usr/bin/load-telemetry-plugin LimitNOFILE=1048576 # Having non-zero Limit*s causes performance problems due to accounting overhead # in the kernel. We recommend using cgroups to do container-local accounting. diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index f720177786..d894c950e1 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -1,13 +1,9 @@ ARCH=$(shell uname -m) ALPINE_IMG:=$(shell $(CURDIR)/../detect_alpine_image) -KERNEL:=$(shell docker version --format '{{.Server.Os}}') ENGINE_DIR:=$(CURDIR)/../../engine -COMMON_DIR:=$(CURDIR)/../common -PLUGIN_DIR:=$(CURDIR)/plugin CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION=$(shell cat $(ENGINE_DIR)/VERSION) -PLUGIN_VERSION?=1.0.0.$(KERNEL)-$(ARCH)-test DOCKER_EXPERIMENTAL=0 GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION)) CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v $(ALPINE_IMG) chown @@ -17,13 +13,11 @@ RPMBUILD=docker run --privileged --rm -i\ -v $(CURDIR)/rpmbuild/BUILDROOT:/root/rpmbuild/BUILDROOT \ -v $(CURDIR)/rpmbuild/RPMS:/root/rpmbuild/RPMS \ -v $(CURDIR)/rpmbuild/SRPMS:/root/rpmbuild/SRPMS \ - -v $(CURDIR)/systemd:/systemd \ - -v $(COMMON_DIR):/common + -v $(CURDIR)/systemd:/systemd RPMBUILD_FLAGS=-ba\ --define '_gitcommit $(word 3,$(GEN_RPM_VER))' \ --define '_release $(word 2,$(GEN_RPM_VER))' \ --define '_version $(word 1,$(GEN_RPM_VER))' \ - --define '_plugin_version $(PLUGIN_VERSION)' \ --define '_origversion $(VERSION)' \ --define '_experimental $(DOCKER_EXPERIMENTAL)' \ SPECS/docker-ce.spec @@ -43,22 +37,22 @@ fedora: fedora-26 fedora-25 fedora-24 ## build all fedora rpm packages centos: centos-7 ## build all centos rpm packages -fedora-26: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/telemetry.tgz ## build fedora-26 rpm packages +fedora-26: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build fedora-26 rpm packages docker build -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ $(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild -fedora-25: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/telemetry.tgz ## build fedora-25 rpm packages +fedora-25: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build fedora-25 rpm packages docker build -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ $(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild -fedora-24: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/telemetry.tgz ## build fedora-24 rpm packages +fedora-24: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build fedora-24 rpm packages docker build -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ $(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild -centos-7: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/telemetry.tgz ## build centos-7 rpm packages +centos-7: rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build centos-7 rpm packages docker build -t rpmbuild-$@/$(ARCH) -f $@/Dockerfile.$(ARCH) $@ $(RPMBUILD) rpmbuild-$@/$(ARCH) $(RPMBUILD_FLAGS) $(CHOWN) -R $(shell id -u):$(shell id -g) rpmbuild @@ -78,15 +72,3 @@ rpmbuild/SOURCES/engine.tgz: -v $(CURDIR)/rpmbuild/SOURCES:/v \ $(ALPINE_IMG) \ tar -C / -c -z -f /v/engine.tgz --exclude .git engine - -rpmbuild/SOURCES/telemetry.tgz: - mkdir -p rpmbuild/SOURCES - mkdir -p $(PLUGIN_DIR) - docker create --name tmp docker/telemetry-tgz:$(PLUGIN_VERSION) - docker export tmp | tar -x -C $(PLUGIN_DIR) - docker run --rm -i -w /plugin \ - -v $(PLUGIN_DIR):/plugin \ - -v $(CURDIR)/rpmbuild/SOURCES:/v \ - alpine \ - cp telemetry_$(PLUGIN_VERSION).tgz /v - docker rm -f tmp diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index 7c5e47bcea..82445d3333 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -6,7 +6,6 @@ Group: Tools/Docker License: ASL 2.0 Source0: engine.tgz Source1: cli.tgz -Source2: telemetry_%{_plugin_version}.tgz URL: https://www.docker.com Vendor: Docker Packager: Docker @@ -69,8 +68,6 @@ pushd engine TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini hack/make.sh dynbinary popd -mkdir -p plugin -printf '{"edition_type":"ce","edition_name":"%s","edition_version":"%s"}\n' "${DISTRO}" "%{_version}" > plugin/.plugin-metadata %check cli/build/docker -v @@ -141,12 +138,6 @@ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do cp "cli/$cli_file" "build-docs/cli-$cli_file" done -# add telemetry plugin -install -d $RPM_BUILD_ROOT/var/lib/docker/plugins/tar -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/lib/docker/plugins/tar -install -p -m 644 plugin/.plugin-metadata $RPM_BUILD_ROOT/var/lib/docker/plugins/tar -install -p -m 755 /common/load-telemetry-plugin $RPM_BUILD_ROOT/%{_bindir}/load-telemetry-plugin - # list files owned by the package here %files %doc build-docs/engine-AUTHORS build-docs/engine-CHANGELOG.md build-docs/engine-CONTRIBUTING.md build-docs/engine-LICENSE build-docs/engine-MAINTAINERS build-docs/engine-NOTICE build-docs/engine-README.md @@ -172,9 +163,6 @@ install -p -m 755 /common/load-telemetry-plugin $RPM_BUILD_ROOT/%{_bindir}/load- /usr/share/vim/vimfiles/ftdetect/dockerfile.vim /usr/share/vim/vimfiles/syntax/dockerfile.vim /usr/share/nano/Dockerfile.nanorc -/var/lib/docker/plugins/tar/telemetry_%{_plugin_version}.tgz -/var/lib/docker/plugins/tar/.plugin-metadata -/usr/bin/load-telemetry-plugin %pre if [ $1 -gt 0 ] ; then diff --git a/components/packaging/rpm/fedora-24/docker-ce.spec b/components/packaging/rpm/fedora-24/docker-ce.spec index 75948dceaa..84108421fc 100644 --- a/components/packaging/rpm/fedora-24/docker-ce.spec +++ b/components/packaging/rpm/fedora-24/docker-ce.spec @@ -6,7 +6,6 @@ Group: Tools/Docker License: ASL 2.0 Source0: engine.tgz Source1: cli.tgz -Source2: telemetry_%{_plugin_version}.tgz URL: https://www.docker.com Vendor: Docker Packager: Docker @@ -70,8 +69,6 @@ pushd engine TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini hack/make.sh dynbinary popd -mkdir -p plugin -printf '{"edition_type":"ce","edition_name":"%s","edition_version":"%s"}\n' "${DISTRO}" "%{_version}" > plugin/.plugin-metadata %check cli/build/docker -v @@ -142,12 +139,6 @@ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do cp "cli/$cli_file" "build-docs/cli-$cli_file" done -# add telemetry plugin -install -d $RPM_BUILD_ROOT/var/lib/docker/plugins/tar -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/lib/docker/plugins/tar -install -p -m 644 plugin/.plugin-metadata $RPM_BUILD_ROOT/var/lib/docker/plugins/tar -install -p -m 755 /common/load-telemetry-plugin $RPM_BUILD_ROOT/%{_bindir}/load-telemetry-plugin - # list files owned by the package here %files %doc build-docs/engine-AUTHORS build-docs/engine-CHANGELOG.md build-docs/engine-CONTRIBUTING.md build-docs/engine-LICENSE build-docs/engine-MAINTAINERS build-docs/engine-NOTICE build-docs/engine-README.md @@ -173,9 +164,6 @@ install -p -m 755 /common/load-telemetry-plugin $RPM_BUILD_ROOT/%{_bindir}/load- /usr/share/vim/vimfiles/ftdetect/dockerfile.vim /usr/share/vim/vimfiles/syntax/dockerfile.vim /usr/share/nano/Dockerfile.nanorc -/var/lib/docker/plugins/tar/telemetry_%{_plugin_version}.tgz -/var/lib/docker/plugins/tar/.plugin-metadata -/usr/bin/load-telemetry-plugin %pre if [ $1 -gt 0 ] ; then diff --git a/components/packaging/rpm/fedora-25/docker-ce.spec b/components/packaging/rpm/fedora-25/docker-ce.spec index 34fc85d0d7..09d1cbf465 100644 --- a/components/packaging/rpm/fedora-25/docker-ce.spec +++ b/components/packaging/rpm/fedora-25/docker-ce.spec @@ -6,7 +6,6 @@ Group: Tools/Docker License: ASL 2.0 Source0: engine.tgz Source1: cli.tgz -Source2: telemetry_%{_plugin_version}.tgz URL: https://www.docker.com Vendor: Docker Packager: Docker @@ -68,8 +67,6 @@ pushd engine TMP_GOPATH="/go" hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini hack/make.sh dynbinary popd -mkdir -p plugin -printf '{"edition_type":"ce","edition_name":"%s","edition_version":"%s"}\n' "${DISTRO}" "%{_version}" > plugin/.plugin-metadata %check cli/build/docker -v @@ -140,12 +137,6 @@ for cli_file in LICENSE MAINTAINERS NOTICE README.md; do cp "cli/$cli_file" "build-docs/cli-$cli_file" done -# add telemetry plugin -install -d $RPM_BUILD_ROOT/var/lib/docker/plugins/tar -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/lib/docker/plugins/tar -install -p -m 644 plugin/.plugin-metadata $RPM_BUILD_ROOT/var/lib/docker/plugins/tar -install -p -m 755 /common/load-telemetry-plugin $RPM_BUILD_ROOT/%{_bindir}/load-telemetry-plugin - # list files owned by the package here %files %doc build-docs/engine-AUTHORS build-docs/engine-CHANGELOG.md build-docs/engine-CONTRIBUTING.md build-docs/engine-LICENSE build-docs/engine-MAINTAINERS build-docs/engine-NOTICE build-docs/engine-README.md @@ -171,9 +162,6 @@ install -p -m 755 /common/load-telemetry-plugin $RPM_BUILD_ROOT/%{_bindir}/load- /usr/share/vim/vimfiles/ftdetect/dockerfile.vim /usr/share/vim/vimfiles/syntax/dockerfile.vim /usr/share/nano/Dockerfile.nanorc -/var/lib/docker/plugins/tar/telemetry_%{_plugin_version}.tgz -/var/lib/docker/plugins/tar/.plugin-metadata -/usr/bin/load-telemetry-plugin %pre if [ $1 -gt 0 ] ; then diff --git a/components/packaging/rpm/systemd/docker.service b/components/packaging/rpm/systemd/docker.service index ac2e9cec6d..6c60646b56 100644 --- a/components/packaging/rpm/systemd/docker.service +++ b/components/packaging/rpm/systemd/docker.service @@ -11,7 +11,6 @@ Type=notify # for containers run by docker ExecStart=/usr/bin/dockerd ExecReload=/bin/kill -s HUP $MAINPID -ExecStartPost=/usr/bin/load-telemetry-plugin # Having non-zero Limit*s causes performance problems due to accounting overhead # in the kernel. We recommend using cgroups to do container-local accounting. LimitNOFILE=infinity