Update to use canto-base:v19

This is a squashed version of canto-base:v18 Refs #2870
pombase · Jan 12, 2025 · ba73fbc · ba73fbc
1 parent 06ce862
commit ba73fbc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ services:
   - docker
 
 before_install:
-  - docker pull pombase/canto-base:v18
+  - docker pull pombase/canto-base:v19
 
 # this runs "make test" inside a Docker container
 script: ./etc/docker-run-tests.sh
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM pombase/canto-base:v18
+FROM pombase/canto-base:v19
 MAINTAINER Kim Rutherford <[email protected]>
 
 COPY . canto/

diff --git a/etc/Dockerfile-base b/etc/Dockerfile-base
@@ -1,4 +1,4 @@
-# build with: docker build --squash -f etc/Dockerfile-base -t=pombase/canto-base:v18 .
+# build with: docker build --squash -f etc/Dockerfile-base -t=pombase/canto-base:v19 .
 
 FROM bitnami/minideb:bookworm
 MAINTAINER Kim Rutherford <[email protected]>

diff --git a/etc/docker-run-tests.sh b/etc/docker-run-tests.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -
 
 docker run --rm --net="host" --mount type=bind,source=$(pwd)/,target=/canto -w=/canto \
-    pombase/canto-base:v18 /bin/bash -c "cd /canto && perl Makefile.PL && make test"
+    pombase/canto-base:v19 /bin/bash -c "cd /canto && perl Makefile.PL && make test"
diff --git a/script/canto_docker b/script/canto_docker
@@ -55,7 +55,7 @@ then
     DOCKER_COMMAND="podman"
 fi
 
-CANTO_DOCKER_RUN_ARGS="$EXTRA_ARGS --rm $INTERACTIVE_ARGS --mount type=bind,source=$(pwd)/logs,target=/logs --mount type=bind,source=$(pwd)/data,target=/data --mount type=bind,source=$(pwd)/import_export,target=/import_export --mount type=bind,source=$(pwd)/canto,target=/canto -w=/canto docker.io/pombase/canto-base:v18"
+CANTO_DOCKER_RUN_ARGS="$EXTRA_ARGS --rm $INTERACTIVE_ARGS --mount type=bind,source=$(pwd)/logs,target=/logs --mount type=bind,source=$(pwd)/data,target=/data --mount type=bind,source=$(pwd)/import_export,target=/import_export --mount type=bind,source=$(pwd)/canto,target=/canto -w=/canto docker.io/pombase/canto-base:v19"
 
 cd canto
 

diff --git a/script/canto_start_docker b/script/canto_start_docker
@@ -76,7 +76,7 @@ then
     fi
 fi
 
-CANTO_DOCKER_RUN_ARGS="$EXTRA_ARGS -i $TTY_OPT --rm $DEBUG --mount type=bind,source=$(pwd)/logs,target=/logs  --mount type=bind,source=$(pwd)/data,target=/data --mount type=bind,source=$(pwd)/import_export,target=/import_export --mount type=bind,source=$(pwd)/canto,target=/canto -w=/canto pombase/canto-base:v18"
+CANTO_DOCKER_RUN_ARGS="$EXTRA_ARGS -i $TTY_OPT --rm $DEBUG --mount type=bind,source=$(pwd)/logs,target=/logs  --mount type=bind,source=$(pwd)/data,target=/data --mount type=bind,source=$(pwd)/import_export,target=/import_export --mount type=bind,source=$(pwd)/canto,target=/canto -w=/canto pombase/canto-base:v19"
 
 cd canto
-Original file line number
+Diff line change
@@ Expand Up / @@ -76,7 +76,7 @@ then @@
         fi
     fi
-    CANTO_DOCKER_RUN_ARGS="$EXTRA_ARGS -i $TTY_OPT --rm $DEBUG --mount type=bind,source=$(pwd)/logs,target=/logs  --mount type=bind,source=$(pwd)/data,target=/data --mount type=bind,source=$(pwd)/import_export,target=/import_export --mount type=bind,source=$(pwd)/canto,target=/canto -w=/canto pombase/canto-base:v18"
+    CANTO_DOCKER_RUN_ARGS="$EXTRA_ARGS -i $TTY_OPT --rm $DEBUG --mount type=bind,source=$(pwd)/logs,target=/logs  --mount type=bind,source=$(pwd)/data,target=/data --mount type=bind,source=$(pwd)/import_export,target=/import_export --mount type=bind,source=$(pwd)/canto,target=/canto -w=/canto pombase/canto-base:v19"
     cd canto
@@ Expand Down @@