Merge pull request #248 from vertica/release-prep

Update image
vertica · Apr 17, 2024 · 8b0cab1 · 8b0cab1
2 parents fe12d60 + 2e47032
commit 8b0cab1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Make sure errors happen when building "latest"
       run: bash -ec "! make verticapylab-build"
     - name: Create a VerticaPyLab container
-      run: sed -i s/#VERTICAPYLAB_IMG_VERSION=latest/VERTICAPYLAB_IMG_VERSION=v0.0/ etc/VerticaPyLab.conf && make verticapylab-build
+      run: sed -i s/#VERTICAPYLAB_IMG_VERSION=v0.2.0-minimal/VERTICAPYLAB_IMG_VERSION=v0.0/ etc/VerticaPyLab.conf && make verticapylab-build
     - name: Create a VerticaPyLab container in test mode
       run: TEST_MODE=yes make verticapylab-build
     - name: Check VerticaPy container for test mode

diff --git a/bin/verticapylab b/bin/verticapylab
@@ -167,6 +167,13 @@ Host $VERTICA_HOST_NAME $SSH_CONFIG_EXTRA_HOSTNAME
 if [[ $(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then
   trap ' tput setaf 1; echo "VerticaPy installation failed"; tput sgr0; ' EXIT
 
+  echo "Installing Git"
+  if docker exec -i "$VERTICAPYLAB_CONTAINER_NAME" bash -c 'apt-get update -yqq; apt-get install -yqq git 1> /dev/null' 2> /dev/null; then
+    echo "Git installed!"
+  else
+    docker stop "$VERTICAPYLAB_CONTAINER_NAME"
+    exit 1
+  fi
   echo "Uninstalling old VerticaPy"
   docker exec -i "$VERTICAPYLAB_CONTAINER_NAME" pip uninstall --yes verticapy 2> /dev/null 
   echo "Installing latest VerticaPy"

diff --git a/bin/verticapylab-build b/bin/verticapylab-build
@@ -20,7 +20,7 @@ if [[ $(tr '[:lower:]' '[:upper:]'<<< ${TEST_MODE}) == "YES" ]] ; then
   VERTICAPYLAB_IMG_VERSION=$VERSION
 fi
 
-if [[ $VERTICAPYLAB_IMG_VERSION == latest ]] ; then
+if [[ $VERTICAPYLAB_IMG_VERSION == v0.2.0-minimal ]] ; then
 	  echo "Set a version number for VERTICAPYLAB_IMG_VERSION in etc/VerticaPyLab.conf";
 	  exit 1
 fi

diff --git a/etc/VerticaPyLab.conf.default b/etc/VerticaPyLab.conf.default
@@ -6,7 +6,7 @@
 #
 VERTICAPYLAB_CONTAINER_NAME=verticapylab
 VERTICAPYLAB_IMG=verticapy-jupyterlab
-VERTICAPYLAB_IMG_VERSION=latest
+VERTICAPYLAB_IMG_VERSION=v0.2.0-minimal
 VERTICAPYLAB_PORT=8889 # Optionally set VERTICALAB_PORT=RANDOM
 VERTICAPYLAB_BIND_ADDRESS=127.0.0.1 # change to 0.0.0.0 if you want to connect from a remote
 PYTHON_VERSION=3.10.13-slim-bullseye
@@ -21,7 +21,7 @@ VERTICA_CONTAINER_NAME=verticadb
 VERTICA_HOST_NAME=$VERTICA_CONTAINER_NAME
 VERTICA_DB_NAME=$VERTICA_CONTAINER_NAME
 DB_NAME=demo
-VERTICA_DOCKER_IMAGE=vertica/vertica-k8s:23.4.0-0-minimal # see https://hub.docker.com/r/vertica/vertica-k8s
+VERTICA_DOCKER_IMAGE=opentext/vertica-k8s:23.4.0-0-minimal # see https://hub.docker.com/r/vertica/vertica-k8s
 VSQL_USER=dbadmin
 #VERTICA_RUNARGS+=( ) # add more args to the docker run command