move to usage of Bionic as default ubuntu version for local ci containers

diff --git a/README.md b/README.md
index c71e0f6..15e2787 100644 (file)
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ The full sequence of operations is:
     # and, once you have finished all testing related work:
     ./tests/ci/vm.sh cleanup
 
     # and, once you have finished all testing related work:
     ./tests/ci/vm.sh cleanup
 

-By default tests are run using php 7.0 in a Container based on Ubuntu 16 Xenial.
+By default tests are run using php 7.0 in a Container based on Ubuntu 18 Bionic.

 You can change the version of PHP and Ubuntu in use by setting the environment variables PHP_VERSION and UBUNTU_VERSION
 before building the Container.
 
 You can change the version of PHP and Ubuntu in use by setting the environment variables PHP_VERSION and UBUNTU_VERSION
 before building the Container.
 

diff --git a/tests/ci/Dockerfile b/tests/ci/Dockerfile
index 15104e6..d8c4443 100644 (file)
--- a/tests/ci/Dockerfile
+++ b/tests/ci/Dockerfile
@@ -1,4 +1,4 @@
-ARG UBUNTU_VERSION=xenial
+ARG UBUNTU_VERSION=bionic

 
 FROM ubuntu:${UBUNTU_VERSION}
 
 
 FROM ubuntu:${UBUNTU_VERSION}
 

diff --git a/tests/ci/vm.sh b/tests/ci/vm.sh
index 6e7493a..a44c825 100755 (executable)
--- a/tests/ci/vm.sh
+++ b/tests/ci/vm.sh
@@ -10,7 +10,7 @@ ACTION="${1}"
 export PHP_VERSION=${PHP_VERSION:-default}
 # Valid values: precise (12), trusty (14), xenial (16), bionic (18), focal (20)
 # We default to the same version we use on Travis
 export PHP_VERSION=${PHP_VERSION:-default}
 # Valid values: precise (12), trusty (14), xenial (16), bionic (18), focal (20)
 # We default to the same version we use on Travis

-export UBUNTU_VERSION=${UBUNTU_VERSION:-xenial}
+export UBUNTU_VERSION=${UBUNTU_VERSION:-bionic}

 
 CONTAINER_USER=docker
 CONTAINER_BUILD_DIR="/home/${CONTAINER_USER}/build"
 
 CONTAINER_USER=docker
 CONTAINER_BUILD_DIR="/home/${CONTAINER_USER}/build"


@@ -43,7 +43,7 @@ Options:
 
 Environment variables: to be set before the 'build' action
     PHP_VERSION       default value: 'default', ie. the stock php version from the Ubuntu version in use. Other possible values: 5.6, 7.0 .. 8.1
 
 Environment variables: to be set before the 'build' action
     PHP_VERSION       default value: 'default', ie. the stock php version from the Ubuntu version in use. Other possible values: 5.6, 7.0 .. 8.1

-    UBUNTU_VERSION    default value: xenial. Other possible values: bionic, focal
+    UBUNTU_VERSION    default value: bionic. Other possible values: xenial, focal

 "
 }
 
 "
 }