Pull request #94: Test on linux and update cacert url

Merge in COSMOSEE/base from linux-patch-cert-url-update to master

* commit '541428a15ac6b6acc71fede189c074514062ef14':
  Test on linux and update cacert url

scripts/linux/cosmos_build.sh

@@ -15,7 +15,7 @@ docker build -f cosmos/Dockerfile -t cosmos-base cosmos
 docker build -f cosmos-gems/Dockerfile -t cosmos-gems cosmos-gems
 docker build -f cosmos-cmd-tlm-api/Dockerfile -t cosmos-cmd-tlm-api cosmos-cmd-tlm-api
 docker build -f cosmos-script-runner-api/Dockerfile -t cosmos-script-runner-api cosmos-script-runner-api
-docker build -f cosmos-frontend/Dockerfile -t cosmos-frontend-init cosmos-frontend
+docker build -f cosmos-frontend-init/Dockerfile -t cosmos-frontend-init cosmos-frontend-init
 docker build -f cosmos-operator/Dockerfile -t cosmos-operator cosmos-operator
 docker build -f cosmos-init/Dockerfile -t cosmos-init cosmos-init
 

scripts/linux/cosmos_setup.sh

@@ -8,23 +8,21 @@
 # If necessary, before running please copy a local certificate authority .pem file as cacert.pem to this folder
 # This will allow docker to work through local SSL infrastructure such as decryption devices
 
-if [ ! -f cacert.pem ]; then
+if [ ! -f cosmos-ruby/cacert.pem ]; then
   if [ ! -z "$SSL_CERT_FILE" ]; then
-    cp $SSL_CERT_FILE cosmos-ruby\cacert.pem
+    cp $SSL_CERT_FILE cosmos-ruby/cacert.pem
     echo Using $SSL_CERT_FILE as cacert.pem
   else
     echo "Downloading cert from curl"
-    curl -q https://curl.haxx.se/ca/cacert.pem --output cacert.pem
+    curl -q https://curl.se/ca/cacert.pem --output cosmos-ruby/cacert.pem
     if [ $? -ne 0 ]; then
-      echo "ERROR: Problem downloading cacert.pem file from https://curl.haxx.se/ca/cacert.pem" >&2
+      echo "ERROR: Problem downloading cacert.pem file from https://curl.se/ca/cacert.pem" >&2
       echo "cosmos_setup FAILED" >&2
       exit 1
     else
-      echo "Successfully downloaded cacert.pem file from: https://curl.haxx.se/ca/cacert.pem"
-      cp cacert.pem cosmos-ruby/cacert.pem
+      echo "Successfully downloaded cosmos-ruby/cacert.pem file from: https://curl.se/ca/cacert.pem"
     fi
   fi
 else
-  echo Using existing cacert.pem
-  cp cacert.pem cosmos-ruby/cacert.pem
+  echo Using existing cosmos-ruby/cacert.pem
 fi

scripts/linux/cosmos_start.sh

@@ -60,22 +60,22 @@ docker run --network cosmos -p 127.0.0.1:9000:9000  -d --name cosmos-minio -v co
 sleep 30
 
 docker container rm cosmos-cmd-tlm-api || true
-docker build -f cosmos-cmd-tlm-api/Dockerfile -t cosmos-cmd-tlm-api cmd-tlm-api
+docker build -f cosmos-cmd-tlm-api/Dockerfile -t cosmos-cmd-tlm-api cosmos-cmd-tlm-api
 docker run --network cosmos -p 127.0.0.1:2901:2901 -d --name cosmos-cmd-tlm-api cosmos-cmd-tlm-api
 
 docker container rm cosmos-script-runner-api || true
 docker build -f cosmos-script-runner-api/Dockerfile -t cosmos-script-runner-api cosmos-script-runner-api
 docker run --network cosmos -p 127.0.0.1:2902:2902 -d --name cosmos-script-runner-api cosmos-script-runner-api
 
 docker container rm cosmos-operator || true
-docker build -f cosmos-operator/Dockerfile -t cosmos-operator operator
+docker build -f cosmos-operator/Dockerfile -t cosmos-operator cosmos-operator
 docker run --network cosmos -d --name cosmos-operator cosmos-operator
 
 docker container rm cosmos-traefik || true
 docker build -f traefik/Dockerfile -t cosmos-traefik traefik
 docker run --network cosmos -p 127.0.0.1:2900:80 -d --name cosmos-traefik cosmos-traefik
 
-docker build -f cosmos-frontend/Dockerfile -t cosmos-frontend-init cosmos-frontend
+docker build -f cosmos-frontend-init/Dockerfile -t cosmos-frontend-init cosmos-frontend-init
 docker run --network cosmos --name cosmos-frontend-init --rm cosmos-frontend-init
 
 docker build -f cosmos-init/Dockerfile -t cosmos-init cosmos-init

scripts/windows/cosmos_setup.bat

@@ -8,19 +8,17 @@ if not exist cosmos-ruby\cacert.pem (
     echo Using %SSL_CERT_FILE% as cacert.pem
   ) else (
     echo "Downloading cacert.pem from curl"
-    powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (New-Object Net.WebClient).DownloadFile('https://curl.haxx.se/ca/cacert.pem', 'cacert.pem')"
+    powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; (New-Object Net.WebClient).DownloadFile('https://curl.se/ca/cacert.pem', 'cosmos-ruby\cacert.pem')"
     if errorlevel 1 (
-      echo ERROR: Problem downloading cacert.pem file from https://curl.haxx.se/ca/cacert.pem
+      echo ERROR: Problem downloading cosmos-ruby\cacert.pem file from https://curl.se/ca/cacert.pem
       echo cosmos_start FAILED
       exit /b 1
     ) else (
-      echo Successfully downloaded cacert.pem file from: https://curl.haxx.se/ca/cacert.pem
-      copy cacert.pem cosmos-ruby\cacert.pem
+      echo Successfully downloaded cosmos-ruby\cacert.pem file from: https://curl.se/ca/cacert.pem
     )
   )
 ) else (
   echo Using existing cacert.pem
-  copy cacert.pem cosmos-ruby\cacert.pem
 )
 
 @echo on