Skip to content

examples: updating docker-compose version#6574

Merged
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
cpaika:upgrade-example-version
Apr 15, 2019
Merged

examples: updating docker-compose version#6574
mattklein123 merged 1 commit intoenvoyproxy:masterfrom
cpaika:upgrade-example-version

Conversation

@cpaika
Copy link
Copy Markdown

@cpaika cpaika commented Apr 13, 2019

Description:
Upgrading the version of docker-compose for the front proxy example to be up to date with the latest (3.7). Not too many changes other than some feature adds, and removals of things that aren't being used in this docker-compose file. Docs for upgrading docker-compose from 2.x to 3.x
Risk Level: Low
Testing:
Manual testing, starting and hitting the example services after upgrading the version of docker-compose
Docs Changes:
N/A
Release Notes:
N/A

Signed-off-by: Chris Paika <paika.christopher@gmail.com>
@cpaika cpaika force-pushed the upgrade-example-version branch from 0d7c64e to fca3141 Compare April 13, 2019 15:26
@cpaika
Copy link
Copy Markdown
Author

cpaika commented Apr 13, 2019

Not sure why the tests failed - seems like my changes are unrelated to the test files. Not sure if the main pipeline is broken, or the tests that failed are flaky?

@mattklein123
Copy link
Copy Markdown
Member

cc @moderation can you take a quick look?

@moderation
Copy link
Copy Markdown
Contributor

This looks fine to me and my local tests work. Looking at Circle CI output I think this is test flakes.

/retest

@repokitteh-read-only
Copy link
Copy Markdown

🔨 rebuilding ci/circleci: coverage (failed build)
🔨 rebuilding ci/circleci: asan (failed build)

🐱

Caused by: a #6574 (comment) was created by @moderation.

see: more, trace.

Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mattklein123 mattklein123 merged commit a368b4c into envoyproxy:master Apr 15, 2019
@moderation
Copy link
Copy Markdown
Contributor

moderation commented Apr 15, 2019

@cpaika it would be nice to propagate this change to the rest of the examples docker-compose files. Extra points if while at it we rename all *.yml file to *.yaml for consistency throughout the repo AND update the 4 RST documentation files that refer to them.

rg -e 'version: \'' -g '*.y*'
examples/jaeger-tracing/docker-compose.yml
1:version: '2'

examples/grpc-bridge/docker-compose.yml
1:version: '2'

examples/zipkin-tracing/docker-compose.yml
1:version: '2'

examples/mysql/docker-compose.yaml
1:version: '3.5'

examples/lua/docker-compose.yaml
1:version: '2'

examples/front-proxy/docker-compose.yml
1:version: '3.7'

examples/fault-injection/docker-compose.yml
1:version: '2'

examples/jaeger-native-tracing/docker-compose.yml
1:version: '2'

examples/redis/docker-compose.yaml
1:version: '2'

examples/cors/frontend/docker-compose.yml
1:version: '2'

examples/cors/backend/docker-compose.yml
1:version: '2'```

rg 'docker-compose.yml'
docs/root/start/sandboxes/jaeger_native_tracing.rst
25:by docker compose (see :repo:/examples/jaeger-native-tracing/docker-compose.yml). Notice that

docs/root/start/sandboxes/zipkin_tracing.rst
14:by docker compose (see :repo:/examples/zipkin-tracing/docker-compose.yml). Notice that

docs/root/start/sandboxes/jaeger_tracing.rst
14:by docker compose (see :repo:/examples/jaeger-tracing/docker-compose.yml). Notice that

docs/root/start/sandboxes/front_proxy.rst
19:(see :repo:/examples/front-proxy/docker-compose.yml). Moreover, notice

@cpaika
Copy link
Copy Markdown
Author

cpaika commented Apr 16, 2019

@moderation Thanks for giving me a next step to get into the codebase more! I was in the middlef of trying to see where I could get involved thats a perfect next baby step haha. I’ll get on it 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants