Merge pull request #3 from SatoshiPortal/dev

CypherApps v0.2.0
SatoshiPortal · May 8, 2019 · 6ea02f9 · 6ea02f9
2 parents bb50826 + c96f7f0
commit 6ea02f9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/sparkwallet/docker-compose.yaml b/sparkwallet/docker-compose.yaml
@@ -10,18 +10,18 @@ services:
       - "$GATEKEEPER_DATAPATH/htpasswd:/htpasswd/htpasswd"
     labels:
       - "traefik.docker.network=cyphernodeappsnet"
-      - "traefik.frontend.rule=ReplacePathRegex: ^/sparkwallet(.*) $$1"
+      - "traefik.frontend.redirect.regex=^(.*)/sparkwallet$$"
+      - "traefik.frontend.redirect.replacement=$$1/sparkwallet/"
+      - "traefik.frontend.rule=PathPrefix:/sparkwallet;ReplacePathRegex: ^/sparkwallet/(.*) /$$1"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.frontend.auth.basic.usersFile=/htpasswd/htpasswd"
       - "traefik.frontend.headers.customRequestHeaders=X-Access:FoeDdQw5yl7pPfqdlGy3OEk/txGqyJjSbVtffhzs7kc="
       - "traefik.enable=true"
       - "traefik.port=9737"
     networks:
-      - cyphernodenet
       - cyphernodeappsnet
     restart: always
 networks:
   cyphernodeappsnet:
     external: true
-  cyphernodenet:
-    external: true
+
diff --git a/sparkwallet/test.sh b/sparkwallet/test.sh
@@ -15,7 +15,7 @@ timeout_feature() {
     # If no error or 2 minutes passed, we get out of this loop
     ([ "${returncode}" -eq "0" ] || [ $(date +%s) -gt ${endtime} ]) && break
 
-    printf "\e[1;31mMaybe it's too early, I'll retry every ${interval} seconds for $((${totaltime} / 60)) minutes ($((${endtime} - $(date +%s))) seconds left).\e[1;0m"
+    printf "\e[1;31mMaybe it's too early, I'll retry every ${interval} seconds for $((${totaltime} / 60)) minutes ($((${endtime} - $(date +%s))) seconds left).\e[1;0m\r\n"
 
     sleep ${interval}
   done
@@ -25,7 +25,7 @@ timeout_feature() {
 
 do_test() {
   local rc
-  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://localhost/sparkwallet)
+  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://127.0.0.1/sparkwallet/)
   [ "${rc}" -ne "401" ] && return 400
   return 0
 }

diff --git a/welcome/docker-compose.yaml b/welcome/docker-compose.yaml
@@ -4,7 +4,7 @@ services:
   cyphernode_welcome:
     environment:
       - "TRACING=1"
-    image: cyphernode/app_welcome:v0.2.0-rc.2
+    image: cyphernode/app_welcome:v0.2.0
     volumes:
       - "$GATEKEEPER_DATAPATH/certs/cert.pem:/data/cert.pem"
       - "$GATEKEEPER_DATAPATH/keys.properties:/data/keys.properties"
@@ -15,7 +15,7 @@ services:
     restart: always
     labels:
       - "traefik.docker.network=cyphernodeappsnet"
-      - "traefik.frontend.rule=PathPrefix:/welcome; PathPrefixStrip:/welcome"
+      - "traefik.frontend.rule=PathPrefixStrip:/welcome"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.enable=true"
       - "traefik.port=8080"

diff --git a/welcome/test.sh b/welcome/test.sh
@@ -15,7 +15,7 @@ timeout_feature() {
     # If no error or 2 minutes passed, we get out of this loop
     ([ "${returncode}" -eq "0" ] || [ $(date +%s) -gt ${endtime} ]) && break
 
-    printf "\e[1;31mMaybe it's too early, I'll retry every ${interval} seconds for $((${totaltime} / 60)) minutes ($((${endtime} - $(date +%s))) seconds left).\e[1;0m"
+    printf "\e[1;31mMaybe it's too early, I'll retry every ${interval} seconds for $((${totaltime} / 60)) minutes ($((${endtime} - $(date +%s))) seconds left).\e[1;0m\r\n"
 
     sleep ${interval}
   done
@@ -25,7 +25,7 @@ timeout_feature() {
 
 do_test() {
   local rc
-  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://localhost/welcome)
+  rc=$(curl -k -s -o /dev/null -w "%{http_code}" https://127.0.0.1/welcome)
   [ "${rc}" -ne "401" ] && return 400
   return 0
 }