From ba73fbc22dea21bf25bb6b5d6318ef4681e6ab04 Mon Sep 17 00:00:00 2001
From: Kim Rutherford <kmr@aska.gen.nz>
Date: Mon, 13 Jan 2025 12:34:45 +1300
Subject: [PATCH] Update to use canto-base:v19

This is a squashed version of canto-base:v18

Refs pombase/canto#2870
---
 .travis.yml               | 2 +-
 Dockerfile                | 2 +-
 etc/Dockerfile-base       | 2 +-
 etc/docker-run-tests.sh   | 2 +-
 script/canto_docker       | 2 +-
 script/canto_start_docker | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee95a9287..ad4590b00 100644
--- 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
index c8f7ffa65..5d2a0b0fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM pombase/canto-base:v18
+FROM pombase/canto-base:v19
 MAINTAINER Kim Rutherford <kim@pombase.org>
 
 COPY . canto/
diff --git a/etc/Dockerfile-base b/etc/Dockerfile-base
index 62642b327..73005ce37 100644
--- 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 <kim@pombase.org>
diff --git a/etc/docker-run-tests.sh b/etc/docker-run-tests.sh
index 03ba78455..5532f1c0b 100755
--- 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
index 581c79265..8c34bcf9d 100755
--- 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
index d355d2ec4..6ae027d04 100755
--- 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