From 82341047d9aa7130d7b4d1d76e8924717e2ffee3 Mon Sep 17 00:00:00 2001 From: Sander ter Veen <veen@astron.nl> Date: Mon, 1 May 2023 14:34:02 +0000 Subject: [PATCH] Changed to production tag and checkout --- docker/Dockerfile | 4 ++-- scripts/create_html | 4 ++-- scripts/launch-msplots.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 203c652..c7432ab 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -184,9 +184,9 @@ RUN apt-get update -y && \ wget git python3-nose python3-coverage \ python3-astropy -RUN A=$CZ; git clone https://git.astron.nl/ao/sdco/pyautoplot.git ${INSTALLDIR}/pyautoplot && \ +RUN A=$DA; git clone https://git.astron.nl/ao/sdco/pyautoplot.git ${INSTALLDIR}/pyautoplot && \ cd ${INSTALLDIR}/pyautoplot && \ - git checkout tmss && \ + git checkout master && \ python3 setup.py install diff --git a/scripts/create_html b/scripts/create_html index 8c55d34..27b0bc6 100755 --- a/scripts/create_html +++ b/scripts/create_html @@ -14,8 +14,8 @@ from numpy import array, floor # insert TESTLINE in the relevant filenames, e.g. index[TESTLINE].html. Ultimately, TESTLINE could be auto-filled # depending on the TAG environment variable (if it exists and doesn't say 'latest'). For normal use, leave TESTLINE an # empty string (""). Note that TESTLINE doesn't necessarily propagate to programs/scripts called from within this one. -TESTLINE = "-test" -#TESTLINE = "" +#TESTLINE = "-test" +TESTLINE = "" # Data with a completeness figure below this value is flagged as odd sized DATA_INCOMPLETE_THRESHOLD = 0.005 # (==) 0.5% diff --git a/scripts/launch-msplots.sh b/scripts/launch-msplots.sh index b5c279a..7812bb0 100755 --- a/scripts/launch-msplots.sh +++ b/scripts/launch-msplots.sh @@ -16,8 +16,8 @@ TESTLINE="" # Normally, one would want to use pyautoplot:latest (PYAUTOPLOT_TAG=latest). This can be overriden however -PYAUTOPLOT_TAG=test -#PYAUTOPLOT_TAG=latest +#PYAUTOPLOT_TAG=test +PYAUTOPLOT_TAG=latest HOSTNAME=`hostname` PATH="$PATH:/opt/cep/pyautoplot/bin" -- GitLab