Mercurial > hg > easyhg

changeset 716:6fb20633da00

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Defeat cacheing; switch to 16.04 for deb build (no point in trying to support 14.04 as it doesn't have the python-pyqt5 package that is one of our dependencies)
author Chris Cannam
date Wed, 12 Dec 2018 14:10:55 +0000
parents 665da28f1da8
children 2a27275b8540
files deploy/linux/docker/Dockerfile_appimage.in deploy/linux/docker/Dockerfile_deb.in deploy/linux/docker/Dockerfile_test_appimage.in deploy/linux/docker/Dockerfile_test_deb.in
diffstat 4 files changed, 22 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/deploy/linux/docker/Dockerfile_appimage.in	Wed Dec 12 14:10:20 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_appimage.in	Wed Dec 12 14:10:55 2018 +0000
@@ -25,6 +25,10 @@
 ENV LANGUAGE en_US:en  
 ENV LC_ALL en_US.UTF-8
 
+# Ensure that everything subsequent is re-run when a new revision is
+# being built (rather than being cached)
+RUN echo [[REVISION]]
+
 WORKDIR /root
 COPY id_dsa_build .ssh/id_dsa_build
 COPY known_hosts .ssh/known_hosts
--- a/deploy/linux/docker/Dockerfile_deb.in	Wed Dec 12 14:10:20 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_deb.in	Wed Dec 12 14:10:55 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 && \
@@ -25,6 +21,10 @@
 ENV LANGUAGE en_US:en  
 ENV LC_ALL en_US.UTF-8
 
+# Ensure that everything subsequent is re-run when a new revision is
+# being built (rather than being cached)
+RUN echo [[REVISION]]
+
 WORKDIR /root
 COPY id_dsa_build .ssh/id_dsa_build
 COPY known_hosts .ssh/known_hosts
--- a/deploy/linux/docker/Dockerfile_test_appimage.in	Wed Dec 12 14:10:20 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_test_appimage.in	Wed Dec 12 14:10:55 2018 +0000
@@ -1,4 +1,11 @@
 FROM centos:7
+
+# 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 update
 RUN yum -y groupinstall "X Window System"
 RUN yum -y install wget
--- a/deploy/linux/docker/Dockerfile_test_deb.in	Wed Dec 12 14:10:20 2018 +0000
+++ b/deploy/linux/docker/Dockerfile_test_deb.in	Wed Dec 12 14:10:55 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
 RUN apt-get -y dist-upgrade
 ADD output/easymercurial_[[RELEASE]]_amd64.deb easymercurial_[[RELEASE]]_amd64.deb