From 128f2475ead729baa2c63e64d1a9c1486d61c7f3 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Thu, 6 Jun 2024 14:33:05 -0700 Subject: [PATCH 1/2] Update oio.sh to delete oldest backup in 'medley dev2prod' command - needed if we automate weekly online builds; added 'medley restore' command to restore previous version of the production image --- system/oio.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/system/oio.sh b/system/oio.sh index aff05e84..642e9c4a 100755 --- a/system/oio.sh +++ b/system/oio.sh @@ -210,13 +210,55 @@ case $1 in ;; Idev2prodI) - lastlast1=$(docker images -q ghcr.io/interlisp/online-medley:lastlastproduction) - docker tag ghcr.io/interlisp/online-medley:lastproduction ghcr.io/interlisp/online-medley:lastlastproduction - docker tag ghcr.io/interlisp/online-medley:production ghcr.io/interlisp/online-medley:lastproduction - docker tag ghcr.io/interlisp/online-medley:development ghcr.io/interlisp/online-medley:production + if [ -z "$(docker images -q ghcr.io/interlisp/online-medley:development)" ] + then + echo "ERROR: docker image \"ghcr.io/interlisp/online-medley:development\" does not exist." + exit 1 + fi + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-3)" + then + docker image rm ghcr.io/interlisp/online-medley:production-3 + fi + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-2)" + then + docker tag ghcr.io/interlisp/online-medley:production-2 ghcr.io/interlisp/online-medley:production-3 + fi + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-1)" + then + docker tag ghcr.io/interlisp/online-medley:production-1 ghcr.io/interlisp/online-medley:production-2 + fi + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production)" + then + docker tag ghcr.io/interlisp/online-medley:production ghcr.io/interlisp/online-medley:production-1 + fi + # + docker tag ghcr.io/interlisp/online-medley:development ghcr.io/interlisp/online-medley:production echo "Online-medley moved from development to production." ;; + IrestoreI) + if [ -z "$(docker images -q ghcr.io/interlisp/online-medley:production-1)" ] + then + echo "ERROR: docker image \"ghcr.io/interlisp/online-medley:production-1\" does not exist." + echo "Cannot restore previous production version" + exit 1 + fi + docker tag ghcr.io/interlisp/online-medley:production-1 ghcr.io/interlisp/online-medley:production + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-2)" + then + docker tag ghcr.io/interlisp/online-medley:production-2 ghcr.io/interlisp/online-medley:production-1 + fi + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-3)" + then + docker tag ghcr.io/interlisp/online-medley:production-3 ghcr.io/interlisp/online-medley:production-2 + fi + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-3)" + then + docker image rm ghcr.io/interlisp/online-medley:production-3 + fi + echo "Previous Online-medley production version restored." + ;; + *) echo "Unknown command: ${oio} medley $2" echo "Use '${oio} help' for usage." @@ -299,6 +341,7 @@ case $1 in echo echo "${oio} medley pulldev: pull latest development (test) online-medley image from GHCR" echo "${oio} medley dev2prod: move current development online-medley image to production status" + echo "${oio} medley restore: restore previous production online-medley image" echo echo "${oio} portal pulldev: pull latest development portal (online-development) docker image from GHCR" echo "${oio} portal pullprod: pull latest production portal (online-production) docker image from GHCR" From 7a1fd2395b2764e6c40e476f6b9d8df7bbeb8255 Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Thu, 6 Jun 2024 14:47:45 -0700 Subject: [PATCH 2/2] Fix typos in recent oio.sh changes --- system/oio.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/system/oio.sh b/system/oio.sh index 642e9c4a..7480d5a9 100755 --- a/system/oio.sh +++ b/system/oio.sh @@ -215,19 +215,19 @@ case $1 in echo "ERROR: docker image \"ghcr.io/interlisp/online-medley:development\" does not exist." exit 1 fi - if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-3)" + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-3)" ] then docker image rm ghcr.io/interlisp/online-medley:production-3 fi - if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-2)" + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-2)" ] then docker tag ghcr.io/interlisp/online-medley:production-2 ghcr.io/interlisp/online-medley:production-3 fi - if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-1)" + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-1)" ] then docker tag ghcr.io/interlisp/online-medley:production-1 ghcr.io/interlisp/online-medley:production-2 fi - if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production)" + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production)" ] then docker tag ghcr.io/interlisp/online-medley:production ghcr.io/interlisp/online-medley:production-1 fi @@ -244,16 +244,13 @@ case $1 in exit 1 fi docker tag ghcr.io/interlisp/online-medley:production-1 ghcr.io/interlisp/online-medley:production - if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-2)" + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-2)" ] then docker tag ghcr.io/interlisp/online-medley:production-2 ghcr.io/interlisp/online-medley:production-1 fi - if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-3)" + if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-3)" ] then docker tag ghcr.io/interlisp/online-medley:production-3 ghcr.io/interlisp/online-medley:production-2 - fi - if [ -n "$(docker images -q ghcr.io/interlisp/online-medley:production-3)" - then docker image rm ghcr.io/interlisp/online-medley:production-3 fi echo "Previous Online-medley production version restored."