diff options
| author | Ryan Chu <ryan.chu@qt.io> | 2019-01-27 23:10:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-29 12:56:38 +0000 |
| commit | 481db443d502c8ebc169b7256cb696428cf02199 (patch) | |
| tree | 94167b09c6a1ef63ac145c93b75e6c1a34e2133e /tests | |
| parent | 698078680fc5a6870177af285fa50c0d8a7c0bc3 (diff) | |
Regenerate TLS certificates after docker machine resumes
After the system reboots, the docker machine is created, but in a
stopped state. As stated in the docker docs, you might get errors when
attempting to connect to a machine or pull an image from Docker Hub.
For instance, Error checking TLS connection: ...
The solution is to regenerate TLS certificates of docker machine after
machine resums.
Change-Id: I8781ac0f0790aeda6cc778aee9c44d03c2b788d3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/testserver.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/testserver.pri b/tests/auto/testserver.pri index 54c8b51d49..73008ea8b3 100644 --- a/tests/auto/testserver.pri +++ b/tests/auto/testserver.pri @@ -154,12 +154,14 @@ isEmpty(TESTSERVER_VERSION) { MACHINE_STATE_CMD = \ docker-machine ls -q --filter "State=Running" --filter "Name=^qt-test-server\$\$" MACHINE_START_CMD = docker-machine start qt-test-server + MACHINE_RECERT = docker-machine regenerate-certs -f qt-test-server PowerShell { testserver_pretest.commands += \ - $$TEST_CMD if (!($$MACHINE_STATE_CMD)) {$$MACHINE_START_CMD} && + $$TEST_CMD if (!($$MACHINE_STATE_CMD)) {$$MACHINE_START_CMD; $$MACHINE_RECERT} && } else { testserver_pretest.commands += \ - $(if $(shell $$MACHINE_STATE_CMD),,$(shell $$MACHINE_START_CMD > /dev/null)) + $(if $(shell $$MACHINE_STATE_CMD),,\ + $(shell $$MACHINE_START_CMD > /dev/null && $$MACHINE_RECERT > /dev/null)) } } |