diff --git a/.circleci/images/plume-buildenv/Caddyfile b/.circleci/images/plume-buildenv/Caddyfile index cc7a4352..4935b75f 100644 --- a/.circleci/images/plume-buildenv/Caddyfile +++ b/.circleci/images/plume-buildenv/Caddyfile @@ -1,5 +1,5 @@ localhost:443 { - proxy / localhost:7878 { + proxy / integration:7878 { transparent } tls self_signed diff --git a/.drone.jsonnet b/.drone.jsonnet index 44d3dd6e..310fcd31 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -5,7 +5,7 @@ // This Docker image contains everything we need to build Plume. // Its Dockerfile can be found at https://git.joinplu.me/plume/buildenv -local plumeEnv = "plumeorg/plume-buildenv:v0.0.9"; +local plumeEnv = "plumeorg/plume-buildenv:v0.2.0"; // Common cache config local cacheConfig(name, extra) = { diff --git a/script/browser_test/utils.py b/script/browser_test/utils.py index fcdfb6fb..a1b7daa1 100644 --- a/script/browser_test/utils.py +++ b/script/browser_test/utils.py @@ -21,4 +21,4 @@ class Browser(unittest.TestCase): def get(self, url): # Like "selenium", integration is mapped to the container that runs the plume instance - return self.driver.get("https://integration" + url) + return self.driver.get("https://localhost" + url) diff --git a/script/run_browser_test.sh b/script/run_browser_test.sh index 8861b6b3..32892ce1 100755 --- a/script/run_browser_test.sh +++ b/script/run_browser_test.sh @@ -12,7 +12,7 @@ plm users new -n admin -N 'Admin' -e 'email@exemple.com' -p 'password' plume & caddy -conf /Caddyfile & -until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null +until curl http://integration:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null cd $(dirname $0)/browser_test/ python3 -m unittest *.py