# HG changeset patch
# User Chris Cannam
# Date 1544696536 0
# Node ID 3f3ad67014826f7bfab2d294bc2e1b0162709228
# Parent  40f16d6cbab28c8967201f8ab9099f4dde4da346
Ensure Docker cache is defeated when necessary for a consistent build

diff -r 40f16d6cbab2 -r 3f3ad6701482 deploy/linux/docker/Dockerfile_appimage.in
--- a/deploy/linux/docker/Dockerfile_appimage.in	Wed Dec 12 12:14:47 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_appimage.in	Thu Dec 13 10:22:16 2018 +0000
@@ -1,7 +1,3 @@
-# This pulls the latest versions of capnp & SV from repos - so you
-# will need to defeat the Docker cache by destroying the container
-# each time you want to update it
-#
 FROM ubuntu:14.04
 MAINTAINER Chris Cannam <cannam@all-day-breakfast.com>
 RUN apt-get update && \
diff -r 40f16d6cbab2 -r 3f3ad6701482 deploy/linux/docker/Dockerfile_deb.in
--- a/deploy/linux/docker/Dockerfile_deb.in	Wed Dec 12 12:14:47 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_deb.in	Thu Dec 13 10:22:16 2018 +0000
@@ -1,7 +1,3 @@
-# This pulls the latest versions of capnp & SV from repos - so you
-# will need to defeat the Docker cache by destroying the container
-# each time you want to update it
-#
 FROM ubuntu:14.04
 MAINTAINER Chris Cannam <cannam@all-day-breakfast.com>
 RUN apt-get update && \
diff -r 40f16d6cbab2 -r 3f3ad6701482 deploy/linux/docker/Dockerfile_test_appimage.in
--- a/deploy/linux/docker/Dockerfile_test_appimage.in	Wed Dec 12 12:14:47 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_test_appimage.in	Thu Dec 13 10:22:16 2018 +0000
@@ -1,5 +1,12 @@
 FROM centos:7
-RUN yum update
+
+# Ensure that everything subsequent is re-run when a new revision is
+# being built (rather than being cached) - so as to avoid potential
+# mismatches between results of yum update and the package dependency
+# installation itself
+RUN echo [[REVISION]]
+
+RUN yum -y update
 RUN yum -y groupinstall "X Window System"
 RUN yum -y install wget
 ADD output/SonicVisualiser-[[REVISION]]-x86_64.AppImage SV.AppImage
diff -r 40f16d6cbab2 -r 3f3ad6701482 deploy/linux/docker/Dockerfile_test_deb.in
--- a/deploy/linux/docker/Dockerfile_test_deb.in	Wed Dec 12 12:14:47 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_test_deb.in	Thu Dec 13 10:22:16 2018 +0000
@@ -1,4 +1,11 @@
 FROM ubuntu:18.04
+
+# Ensure that everything subsequent is re-run when a new revision is
+# being built (rather than being cached) - so as to avoid potential
+# mismatches between results of apt-get update and the package
+# dependency installation itself
+RUN echo [[REVISION]]
+
 RUN apt-get update
 ADD output/sonic-visualiser_[[RELEASE]]_amd64.deb sonic-visualiser_[[RELEASE]]_amd64.deb
 RUN apt install -y ./sonic-visualiser_[[RELEASE]]_amd64.deb