Skip to content

Commit 9391057

Browse files
committed
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 <[email protected]>
1 parent 79d76f3 commit 9391057

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

deb/common/docker-ce.postinst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
update_dockerd() {
5-
dbefile=/var/lib/docker/distribution_based_engine.json
5+
dbefile=/var/lib/docker-engine/distribution_based_engine.json
66
URL=https://docs.docker.com/releasenote
77
if [ -f "${dbefile}" ] && sed -e 's/.*"platform"[ \t]*:[ \t]*"\([^"]*\)".*/\1/g' "${dbefile}"| grep -v -i community > /dev/null; then
88
echo
@@ -17,7 +17,7 @@ update_dockerd() {
1717
else
1818
rm -f /usr/bin/dockerd
1919
update-alternatives --install /usr/bin/dockerd dockerd /usr/bin/dockerd-ce 1 --slave \
20-
${dbefile} distribution_based_engine.json /var/lib/docker/distribution_based_engine-ce.json
20+
${dbefile} distribution_based_engine.json /var/lib/docker-engine/distribution_based_engine-ce.json
2121
fi
2222
}
2323

deb/common/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ override_dh_auto_install:
2424
install -D -m 0755 /source/dockerd debian/docker-ce/usr/bin/dockerd-ce
2525
install -D -m 0755 /source/docker-proxy debian/docker-ce/usr/bin/docker-proxy
2626
install -D -m 0755 /source/docker-init debian/docker-ce/usr/bin/docker-init
27-
install -D -m 0644 /sources/distribution_based_engine.json debian/docker-ce/var/lib/docker/distribution_based_engine-ce.json
27+
install -D -m 0644 /sources/distribution_based_engine.json debian/docker-ce/var/lib/docker-engine/distribution_based_engine-ce.json
2828

2929
override_dh_shlibdeps:
3030
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info

rpm/SPECS/docker-ce.spec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ install -D -m 0755 /sources/dockerd $RPM_BUILD_ROOT/%{_bindir}/dockerd-ce
5757
install -D -m 0755 /sources/docker-proxy $RPM_BUILD_ROOT/%{_bindir}/docker-proxy
5858
install -D -m 0755 /sources/docker-init $RPM_BUILD_ROOT/%{_bindir}/docker-init
5959
install -D -m 0644 %{_topdir}/SOURCES/docker.service $RPM_BUILD_ROOT/%{_unitdir}/docker.service
60-
install -D -m 0644 %{_topdir}/SOURCES/distribution_based_engine.json $RPM_BUILD_ROOT/var/lib/docker/distribution_based_engine-ce.json
60+
install -D -m 0644 %{_topdir}/SOURCES/distribution_based_engine.json $RPM_BUILD_ROOT/var/lib/docker-engine/distribution_based_engine-ce.json
6161

6262
%files
6363
/%{_bindir}/dockerd-ce
6464
/%{_bindir}/docker-proxy
6565
/%{_bindir}/docker-init
6666
/%{_unitdir}/docker.service
67-
/var/lib/docker/distribution_based_engine-ce.json
67+
/var/lib/docker-engine/distribution_based_engine-ce.json
6868

6969
%pre
7070
if [ $1 -gt 0 ] ; then
@@ -85,7 +85,7 @@ fi
8585
if ! getent group docker > /dev/null; then
8686
groupadd --system docker
8787
fi
88-
dbefile=/var/lib/docker/distribution_based_engine.json
88+
dbefile=/var/lib/docker-engine/distribution_based_engine.json
8989
URL=https://docs.docker.com/releasenote
9090
if [ -f "${dbefile}" ] && sed -e 's/.*"platform"[ \t]*:[ \t]*"\([^"]*\)".*/\1/g' "${dbefile}"| grep -v -i community > /dev/null; then
9191
echo
@@ -100,7 +100,7 @@ if [ -f "${dbefile}" ] && sed -e 's/.*"platform"[ \t]*:[ \t]*"\([^"]*\)".*/\1/g'
100100
else
101101
rm -f %{_bindir}/dockerd
102102
update-alternatives --install %{_bindir}/dockerd dockerd %{_bindir}/dockerd-ce 1 \
103-
--slave "${dbefile}" distribution_based_engine.json /var/lib/docker/distribution_based_engine-ce.json
103+
--slave "${dbefile}" distribution_based_engine.json /var/lib/docker-engine/distribution_based_engine-ce.json
104104
fi
105105

106106

@@ -113,7 +113,7 @@ update-alternatives --remove dockerd %{_bindir}/dockerd || true
113113

114114
%posttrans
115115
if [ $1 -ge 0 ] ; then
116-
dbefile=/var/lib/docker/distribution_based_engine.json
116+
dbefile=/var/lib/docker-engine/distribution_based_engine.json
117117
URL=https://docs.docker.com/releasenote
118118
if [ -f "${dbefile}" ] && sed -e 's/.*"platform"[ \t]*:[ \t]*"\([^"]*\)".*/\1/g' "${dbefile}"| grep -v -i community > /dev/null; then
119119
echo
@@ -128,7 +128,7 @@ if [ $1 -ge 0 ] ; then
128128
else
129129
rm -f %{_bindir}/dockerd
130130
update-alternatives --install %{_bindir}/dockerd dockerd %{_bindir}/dockerd-ce 1 \
131-
--slave "${dbefile}" distribution_based_engine.json /var/lib/docker/distribution_based_engine-ce.json
131+
--slave "${dbefile}" distribution_based_engine.json /var/lib/docker-engine/distribution_based_engine-ce.json
132132
fi
133133
# package upgrade scenario, after new files are installed
134134

0 commit comments

Comments
 (0)