From 23ba2a13efc5898dd75dd9b09352dfe2e6ac9028 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 26 Sep 2018 22:20:25 +0000 Subject: [PATCH] Change metadata to be stored in docker-engine People blow away `/var/lib/docker` all the time so we probably shouldn't store important data there. Signed-off-by: Eli Uriegas (cherry picked from commit 9391057c9472ba24049b8645c251a4c63894522f) Signed-off-by: Eli Uriegas Upstream-commit: 865140fc4155481b20f694a4528e04e48eb76de4 Component: packaging --- components/packaging/deb/common/docker-ce.postinst | 4 ++-- components/packaging/deb/common/rules | 2 +- components/packaging/rpm/SPECS/docker-ce.spec | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/packaging/deb/common/docker-ce.postinst b/components/packaging/deb/common/docker-ce.postinst index 9d44f04678..d25267648f 100644 --- a/components/packaging/deb/common/docker-ce.postinst +++ b/components/packaging/deb/common/docker-ce.postinst @@ -2,7 +2,7 @@ set -e update_dockerd() { - dbefile=/var/lib/docker/distribution_based_engine.json + dbefile=/var/lib/docker-engine/distribution_based_engine.json URL=https://docs.docker.com/releasenote if [ -f "${dbefile}" ] && sed -e 's/.*"platform"[ \t]*:[ \t]*"\([^"]*\)".*/\1/g' "${dbefile}"| grep -v -i community > /dev/null; then echo @@ -17,7 +17,7 @@ update_dockerd() { else rm -f /usr/bin/dockerd update-alternatives --install /usr/bin/dockerd dockerd /usr/bin/dockerd-ce 1 --slave \ - ${dbefile} distribution_based_engine.json /var/lib/docker/distribution_based_engine-ce.json + ${dbefile} distribution_based_engine.json /var/lib/docker-engine/distribution_based_engine-ce.json fi } diff --git a/components/packaging/deb/common/rules b/components/packaging/deb/common/rules index 26d35b8df1..ed96288ab2 100644 --- a/components/packaging/deb/common/rules +++ b/components/packaging/deb/common/rules @@ -24,7 +24,7 @@ override_dh_auto_install: install -D -m 0755 /source/dockerd debian/docker-ce/usr/bin/dockerd-ce install -D -m 0755 /source/docker-proxy debian/docker-ce/usr/bin/docker-proxy install -D -m 0755 /source/docker-init debian/docker-ce/usr/bin/docker-init - install -D -m 0644 /sources/distribution_based_engine.json debian/docker-ce/var/lib/docker/distribution_based_engine-ce.json + install -D -m 0644 /sources/distribution_based_engine.json debian/docker-ce/var/lib/docker-engine/distribution_based_engine-ce.json override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info diff --git a/components/packaging/rpm/SPECS/docker-ce.spec b/components/packaging/rpm/SPECS/docker-ce.spec index 2c7fb97ed4..062c374adb 100644 --- a/components/packaging/rpm/SPECS/docker-ce.spec +++ b/components/packaging/rpm/SPECS/docker-ce.spec @@ -57,14 +57,14 @@ install -D -m 0755 /sources/dockerd $RPM_BUILD_ROOT/%{_bindir}/dockerd-ce install -D -m 0755 /sources/docker-proxy $RPM_BUILD_ROOT/%{_bindir}/docker-proxy install -D -m 0755 /sources/docker-init $RPM_BUILD_ROOT/%{_bindir}/docker-init install -D -m 0644 %{_topdir}/SOURCES/docker.service $RPM_BUILD_ROOT/%{_unitdir}/docker.service -install -D -m 0644 %{_topdir}/SOURCES/distribution_based_engine.json $RPM_BUILD_ROOT/var/lib/docker/distribution_based_engine-ce.json +install -D -m 0644 %{_topdir}/SOURCES/distribution_based_engine.json $RPM_BUILD_ROOT/var/lib/docker-engine/distribution_based_engine-ce.json %files /%{_bindir}/dockerd-ce /%{_bindir}/docker-proxy /%{_bindir}/docker-init /%{_unitdir}/docker.service -/var/lib/docker/distribution_based_engine-ce.json +/var/lib/docker-engine/distribution_based_engine-ce.json %pre if [ $1 -gt 0 ] ; then @@ -85,7 +85,7 @@ fi if ! getent group docker > /dev/null; then groupadd --system docker fi -dbefile=/var/lib/docker/distribution_based_engine.json +dbefile=/var/lib/docker-engine/distribution_based_engine.json URL=https://docs.docker.com/releasenote if [ -f "${dbefile}" ] && sed -e 's/.*"platform"[ \t]*:[ \t]*"\([^"]*\)".*/\1/g' "${dbefile}"| grep -v -i community > /dev/null; then echo @@ -100,7 +100,7 @@ if [ -f "${dbefile}" ] && sed -e 's/.*"platform"[ \t]*:[ \t]*"\([^"]*\)".*/\1/g' else rm -f %{_bindir}/dockerd update-alternatives --install %{_bindir}/dockerd dockerd %{_bindir}/dockerd-ce 1 \ - --slave "${dbefile}" distribution_based_engine.json /var/lib/docker/distribution_based_engine-ce.json + --slave "${dbefile}" distribution_based_engine.json /var/lib/docker-engine/distribution_based_engine-ce.json fi @@ -113,7 +113,7 @@ update-alternatives --remove dockerd %{_bindir}/dockerd || true %posttrans if [ $1 -ge 0 ] ; then - dbefile=/var/lib/docker/distribution_based_engine.json + dbefile=/var/lib/docker-engine/distribution_based_engine.json URL=https://docs.docker.com/releasenote if [ -f "${dbefile}" ] && sed -e 's/.*"platform"[ \t]*:[ \t]*"\([^"]*\)".*/\1/g' "${dbefile}"| grep -v -i community > /dev/null; then echo @@ -128,7 +128,7 @@ if [ $1 -ge 0 ] ; then else rm -f %{_bindir}/dockerd update-alternatives --install %{_bindir}/dockerd dockerd %{_bindir}/dockerd-ce 1 \ - --slave "${dbefile}" distribution_based_engine.json /var/lib/docker/distribution_based_engine-ce.json + --slave "${dbefile}" distribution_based_engine.json /var/lib/docker-engine/distribution_based_engine-ce.json fi # package upgrade scenario, after new files are installed