docker ccppetmr/base:latest -> ccppetmr/sirf:core

SyneRBI · Feb 10, 2018 · e0d571e · e0d571e
1 parent 471d609
commit e0d571e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -203,12 +203,12 @@ install:
       [[ "$DOCKER_BUILD" == DEVEL ]] && export DCC="$DCC -f $PWD/docker-compose.devel.yml"
       ( set -ev
         # pull previous base image for its layer cache
-        docker pull ccppetmr/base
+        docker pull ccppetmr/sirf:core
         # rebuild base image (using above docker cache)
         # and sirf image (with travis' ccache)
         rm -rf devel/.ccache
         mv ~/.ccache devel/
-        $DCC build --pull base
+        $DCC build --pull core
         $DCC build sirf
         # extract updated ccache
         sudo rm -rf devel/.ccache/*

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ccppetmr/base:latest
+FROM ccppetmr/sirf:core
 LABEL \
   author.name="Casper da Costa-Luis"          \
   author.email=imaging@caspersci.uk.to        \

diff --git a/docker/Dockerfile-base → docker/Dockerfile-core b/docker/Dockerfile-base → docker/Dockerfile-core
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -6,9 +6,9 @@ services:
   build:
    context: .
    # depends_on:
-   #  - base
+   #  - core
    cache_from:
-    - ccppetmr/base:latest
+    - ccppetmr/sirf:core
     - ccppetmr/sirf:latest
   stdin_open: true
   tty: true
@@ -17,13 +17,13 @@ services:
   network_mode: "bridge"
   volumes:
    - ./devel:/devel
- base:
-  image: ccppetmr/base:latest
+ core:
+  image: ccppetmr/sirf:core
   build:
    context: .
-   dockerfile: Dockerfile-base
+   dockerfile: Dockerfile-core
    args:
     mainUser: sirfuser
    cache_from:
     - ubuntu:16.04
-    - ccppetmr/base:latest
+    - ccppetmr/sirf:core