diff --git a/README.md b/README.md index fc9e4e5a..6a8a550d 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ You can run the playground directly with Docker. $ docker run -d --rm \ --privileged \ -v /var/run/docker.sock:/var/run/docker.sock \ - phlax/envoy-playground:0.2.5 + phlax/envoy-playground:0.2.6 ``` You can stop the playground with. diff --git a/VERSION b/VERSION index 3a4036fb..53a75d67 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.5 +0.2.6 diff --git a/docs/getting-started/install.rst b/docs/getting-started/install.rst index 98d5b4a0..0bffef22 100644 --- a/docs/getting-started/install.rst +++ b/docs/getting-started/install.rst @@ -41,7 +41,7 @@ You can run the playground directly with Docker. $ docker run -d --rm \ --privileged \ -v /var/run/docker.sock:/var/run/docker.sock \ - phlax/envoy-playground:|playground_version|-alpha + phlax/envoy-playground:|playground_version| .. warning:: @@ -102,7 +102,7 @@ then start the playground. --host=unix:///run/user/1000/docker.sock \ -p 8000:8080 \ -v /run/user/1000/docker.sock:/var/run/docker.sock \ - phlax/envoy-playground:|playground_version|-alpha' + phlax/envoy-playground:|playground_version|' f01684843c27385eddb9f89d703d0c16137e4480a6377deb0a753e34d730c0e1 You should now be able to access the playground UI on http://localhost:8000 diff --git a/docs/screenshots/network.create.name.png b/docs/screenshots/network.create.name.png index 36594341..6452f5db 100644 Binary files a/docs/screenshots/network.create.name.png and b/docs/screenshots/network.create.name.png differ diff --git a/docs/screenshots/network.create.open.png b/docs/screenshots/network.create.open.png index cae1e3b4..0a3a0b94 100644 Binary files a/docs/screenshots/network.create.open.png and b/docs/screenshots/network.create.open.png differ diff --git a/docs/screenshots/network.create.started.png b/docs/screenshots/network.create.started.png index 36d35ba4..9ddf5211 100644 Binary files a/docs/screenshots/network.create.started.png and b/docs/screenshots/network.create.started.png differ diff --git a/docs/screenshots/network.create.starting.png b/docs/screenshots/network.create.starting.png index 4ebbd525..9ddf5211 100644 Binary files a/docs/screenshots/network.create.starting.png and b/docs/screenshots/network.create.starting.png differ diff --git a/docs/screenshots/proxy.create.binaries.png b/docs/screenshots/proxy.create.binaries.png index 7de1c6a2..dc0056b6 100644 Binary files a/docs/screenshots/proxy.create.binaries.png and b/docs/screenshots/proxy.create.binaries.png differ diff --git a/docs/screenshots/proxy.create.certificates.png b/docs/screenshots/proxy.create.certificates.png index 23a84ebf..b43306a8 100644 Binary files a/docs/screenshots/proxy.create.certificates.png and b/docs/screenshots/proxy.create.certificates.png differ diff --git a/docs/screenshots/proxy.create.configuration.png b/docs/screenshots/proxy.create.configuration.png index 01e705a3..75a1ca7b 100644 Binary files a/docs/screenshots/proxy.create.configuration.png and b/docs/screenshots/proxy.create.configuration.png differ diff --git a/docs/screenshots/proxy.create.logging.png b/docs/screenshots/proxy.create.logging.png index d94b4bd1..137bd288 100644 Binary files a/docs/screenshots/proxy.create.logging.png and b/docs/screenshots/proxy.create.logging.png differ diff --git a/docs/screenshots/proxy.create.name.png b/docs/screenshots/proxy.create.name.png index aeaa2ee1..ca14a08e 100644 Binary files a/docs/screenshots/proxy.create.name.png and b/docs/screenshots/proxy.create.name.png differ diff --git a/docs/screenshots/proxy.create.open.png b/docs/screenshots/proxy.create.open.png index 375ac480..9e340028 100644 Binary files a/docs/screenshots/proxy.create.open.png and b/docs/screenshots/proxy.create.open.png differ diff --git a/docs/screenshots/proxy.create.ports.png b/docs/screenshots/proxy.create.ports.png index a27e3cc1..62c602f9 100644 Binary files a/docs/screenshots/proxy.create.ports.png and b/docs/screenshots/proxy.create.ports.png differ diff --git a/docs/screenshots/proxy.create.started.png b/docs/screenshots/proxy.create.started.png index 3f73c958..1ae746ce 100644 Binary files a/docs/screenshots/proxy.create.started.png and b/docs/screenshots/proxy.create.started.png differ diff --git a/docs/screenshots/proxy.create.starting.png b/docs/screenshots/proxy.create.starting.png index 0c234cc4..19ebfadb 100644 Binary files a/docs/screenshots/proxy.create.starting.png and b/docs/screenshots/proxy.create.starting.png differ diff --git a/docs/screenshots/service.create.configuration.png b/docs/screenshots/service.create.configuration.png index de912b87..af90d873 100644 Binary files a/docs/screenshots/service.create.configuration.png and b/docs/screenshots/service.create.configuration.png differ diff --git a/docs/screenshots/service.create.env.png b/docs/screenshots/service.create.env.png index 73907198..ecb5b888 100644 Binary files a/docs/screenshots/service.create.env.png and b/docs/screenshots/service.create.env.png differ diff --git a/docs/screenshots/service.create.name.png b/docs/screenshots/service.create.name.png index c1655e8c..f3362ae2 100644 Binary files a/docs/screenshots/service.create.name.png and b/docs/screenshots/service.create.name.png differ diff --git a/docs/screenshots/service.create.open.png b/docs/screenshots/service.create.open.png index 7146f229..4a40563e 100644 Binary files a/docs/screenshots/service.create.open.png and b/docs/screenshots/service.create.open.png differ diff --git a/docs/screenshots/service.create.ports.png b/docs/screenshots/service.create.ports.png index 164134f1..0ce9147c 100644 Binary files a/docs/screenshots/service.create.ports.png and b/docs/screenshots/service.create.ports.png differ diff --git a/docs/screenshots/service.create.readme.png b/docs/screenshots/service.create.readme.png index 0517561f..eefba874 100644 Binary files a/docs/screenshots/service.create.readme.png and b/docs/screenshots/service.create.readme.png differ diff --git a/docs/screenshots/service.create.started.png b/docs/screenshots/service.create.started.png index 5db8a92f..9ea9d7ea 100644 Binary files a/docs/screenshots/service.create.started.png and b/docs/screenshots/service.create.started.png differ diff --git a/docs/screenshots/service.create.starting.png b/docs/screenshots/service.create.starting.png index b2a1fbde..1c8069c9 100644 Binary files a/docs/screenshots/service.create.starting.png and b/docs/screenshots/service.create.starting.png differ diff --git a/integration/bin/start-playground.sh b/integration/bin/start-playground.sh index b898ea4a..d04de29a 100755 --- a/integration/bin/start-playground.sh +++ b/integration/bin/start-playground.sh @@ -6,8 +6,8 @@ if [[ -e /code/docker/playground.tar.gz ]]; then docker load < /code/docker/playground.tar.gz elif [[ -n "$PLAYGROUND_VERSION" ]]; then echo ">>> Pulling playground: ${PLAYGROUND_VERSION}" - docker pull "phlax/envoy-playground:${PLAYGROUND_VERSION}-alpha" - docker tag "phlax/envoy-playground:${PLAYGROUND_VERSION}-alpha envoy-playground" + docker pull "phlax/envoy-playground:${PLAYGROUND_VERSION}" + docker tag "phlax/envoy-playground:${PLAYGROUND_VERSION} envoy-playground" else echo "ERROR: Need either an image or a version to pull, can't continue, exiting, bye" >&2 exit 1 diff --git a/integration/tests/journeys/test_network_journeys.py b/integration/tests/journeys/test_network_journeys.py index 86e3f1a6..6dc5883e 100644 --- a/integration/tests/journeys/test_network_journeys.py +++ b/integration/tests/journeys/test_network_journeys.py @@ -11,7 +11,8 @@ def test_journey_network_create(playground): # open the proxy modal playground.web.find_elements_by_name('Networks')[0].click() time.sleep(1) - name_input = playground.web.find_elements_by_id('name')[0] + name_input = playground.web.find_elements_by_id( + 'envoy.playground.name')[0] assert ( name_input.get_attribute('placeholder') == 'Enter network name') diff --git a/integration/tests/journeys/test_proxy_journeys.py b/integration/tests/journeys/test_proxy_journeys.py index 46b34b26..f2a631a4 100644 --- a/integration/tests/journeys/test_proxy_journeys.py +++ b/integration/tests/journeys/test_proxy_journeys.py @@ -11,7 +11,8 @@ def test_journey_proxy_create(playground): # open the proxy modal playground.web.find_elements_by_name('Proxies')[0].click() time.sleep(1) - name_input = playground.web.find_elements_by_id('name')[0] + name_input = playground.web.find_elements_by_id( + 'envoy.playground.name')[0] assert ( name_input.get_attribute('placeholder') == 'Enter proxy name') diff --git a/integration/tests/journeys/test_service_journeys.py b/integration/tests/journeys/test_service_journeys.py index f24211a4..6f265127 100644 --- a/integration/tests/journeys/test_service_journeys.py +++ b/integration/tests/journeys/test_service_journeys.py @@ -11,7 +11,8 @@ def test_journey_service_create(playground): # open the proxy modal playground.web.find_elements_by_name('Services')[0].click() time.sleep(1) - name_input = playground.web.find_elements_by_id('name')[0] + name_input = playground.web.find_elements_by_id( + 'envoy.playground.name')[0] assert ( name_input.get_attribute('placeholder') == 'Enter service name') diff --git a/ui/src/service/forms/configuration.js b/ui/src/service/forms/configuration.js index 1b28edd1..0c420f87 100644 --- a/ui/src/service/forms/configuration.js +++ b/ui/src/service/forms/configuration.js @@ -16,7 +16,7 @@ import {PlaygroundEditor} from '../../shared/editor'; export class ServiceConfigurationForm extends React.PureComponent { - static contexType = PlaygroundContext; + static contextType = PlaygroundContext; static propTypes = exact({ dispatch: PropTypes.func.isRequired, form: PropTypes.object.isRequired, @@ -41,6 +41,7 @@ export class ServiceConfigurationForm extends React.PureComponent { } const configDefault = service_types[service_type]['labels']['envoy.playground.config.default']; if (configDefault) { + console.log(configDefault); const content = await api.get( ['/static', service_type, configDefault].join('/'), 'text');