Update to latest PyWB and robots.txt changes for #96.

ukwa · Jan 13, 2023 · 6795392 · 6795392
1 parent 0badc55
commit 6795392
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/access/website/deploy-access-website.sh b/access/website/deploy-access-website.sh
@@ -7,12 +7,14 @@ if ! [[ ${ENVIRON} =~ dev|beta|prod ]]; then
     exit
 fi
 
+# Defaults for container versions:
+export UKWA_UI_IMAGE="ukwa/ukwa-ui:v1.4.4"
+export UKWA_NGINX_IMAGE="ukwa/ukwa-site:1.0.1"
+export PYWB_IMAGE="ukwa/ukwa-pywb:2.6.9"
+export API_IMAGE="ukwa/ukwa-access-api:1.0.1"
+
 # Set up environment variables
 if [[ ${ENVIRON} == 'prod' ]]; then
-    export UKWA_UI_IMAGE="ukwa/ukwa-ui:v1.4.4"
-    export UKWA_NGINX_IMAGE="ukwa/ukwa-site:1.0.0"
-    export PYWB_IMAGE="ukwa/ukwa-pywb:2.6.7.2"
-    export API_IMAGE="ukwa/ukwa-access-api:1.0.1"
     export SERVER_NAME=www.webarchive.org.uk
     export DEPLOYMENT_TAG=prod
     export STORAGE_PATH_WEBSITE=/mnt/nfs/prod1/access/data/website
@@ -22,10 +24,6 @@ if [[ ${ENVIRON} == 'prod' ]]; then
     source /mnt/nfs/prod1/access/gitlab/ukwa-services-env/prod.env
 
 elif [[ ${ENVIRON} == 'beta' ]]; then
-    export UKWA_UI_IMAGE="ukwa/ukwa-ui:v1.4.4"
-    export UKWA_NGINX_IMAGE="ukwa/ukwa-site:1.0.0"
-    export PYWB_IMAGE="ukwa/ukwa-pywb:2.6.7.2"
-    export API_IMAGE="ukwa/ukwa-access-api:1.0.1"
     export SERVER_NAME=beta.webarchive.org.uk
     export DEPLOYMENT_TAG=beta
     export STORAGE_PATH_WEBSITE=/mnt/gluster/beta/access/data/website
@@ -37,7 +35,7 @@ else
     # dev vars
     export UKWA_UI_IMAGE="ukwa/ukwa-ui:master"
     export UKWA_NGINX_IMAGE="ukwa/ukwa-site:master"
-    export PYWB_IMAGE="ukwa/ukwa-pywb:2.6.7.2"
+    export PYWB_IMAGE="ukwa/ukwa-pywb:master"
     export API_IMAGE="ukwa/ukwa-access-api:master"
     export SERVER_NAME=dev.webarchive.org.uk
     export DEPLOYMENT_TAG=dev