Send repo and branch info into Docker builds

shingleproject · Jul 11, 2018 · ab8a035 · ab8a035
1 parent 7cba602
commit ab8a035
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -54,7 +54,7 @@ matrix:
     dist: xenial
     language: cpp
     install:
-      - docker build -f Dockerfile_Bionic -t shingle .
+      - docker build -e REPO="$TRAVIS_REPO_SLUG" -e BRANCH="$TRAVIS_BRANCH" -f Dockerfile_Bionic -t shingle .
     script:
       - docker run -a stdout -t shingle make unittest
       # Pre-download, to best work with Travis timeout
@@ -73,7 +73,7 @@ matrix:
     dist: xenial
     language: cpp
     install:
-      - docker build -f Dockerfile_Xenial -t shingle .
+      - docker build -e REPO="$TRAVIS_REPO_SLUG" -e BRANCH="$TRAVIS_BRANCH" -f Dockerfile_Xenial -t shingle .
     script:
       - docker run -a stdout -t shingle make unittest
       # Pre-download, to best work with Travis timeout
@@ -92,7 +92,7 @@ matrix:
     dist: xenial
     language: cpp
     install:
-      - docker build -f Dockerfile_Trusty -t shingle .
+      - docker build -e REPO="$TRAVIS_REPO_SLUG" -e BRANCH="$TRAVIS_BRANCH" -f Dockerfile_Trusty -t shingle .
     script:
       - docker run -a stdout -t shingle make unittest
       # Pre-download, to best work with Travis timeout

diff --git a/Dockerfile_Bionic b/Dockerfile_Bionic
@@ -55,9 +55,9 @@ USER shingle
 WORKDIR /home/shingle
 
 # Make a copy of the project Shingle
-RUN git clone https://github.com/shingle/Shingle.git
+RUN git clone "https://github.com/${REPO}"
 WORKDIR /home/shingle/Shingle
-RUN git checkout master
+RUN git checkout "$BRANCH"
 RUN git pull
 
 ENV PATH /home/shingle/Shingle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

diff --git a/Dockerfile_Trusty b/Dockerfile_Trusty
@@ -44,11 +44,12 @@ USER shingle
 WORKDIR /home/shingle
 
 # Make a copy of the project Shingle
-RUN git clone https://github.com/shingle/Shingle.git
+RUN git clone "https://github.com/${REPO}"
 WORKDIR /home/shingle/Shingle
-RUN git checkout master
+RUN git checkout "$BRANCH"
 RUN git pull
 
+
 ENV PATH /home/shingle/Shingle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN make

diff --git a/Dockerfile_Xenial b/Dockerfile_Xenial
@@ -53,11 +53,12 @@ USER shingle
 WORKDIR /home/shingle
 
 # Make a copy of the project Shingle
-RUN git clone https://github.com/shingle/Shingle.git
+RUN git clone "https://github.com/${REPO}"
 WORKDIR /home/shingle/Shingle
-RUN git checkout master
+RUN git checkout "$BRANCH"
 RUN git pull
 
+
 ENV PATH /home/shingle/Shingle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 RUN make

diff --git a/setup.py b/setup.py
@@ -43,7 +43,7 @@
 #)
 
 setup(name='shingle',
-    version='2.1.1',
+    version='2.1.2',
     description='Generation of boundary representation and mesh spatial discretisations from arbitrary geophysical fields.',
     author = 'Adam S. Candy',
     author_email='[email protected]',