Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ where `<hash>` is specified in [`envoy_build_sha.sh`](https://github.com/envoypr
may work with `envoyproxy/envoy-build:latest` to provide a self-contained environment for building Envoy binaries and
running tests that reflects the latest built Ubuntu Envoy image. Moreover, the Docker image
at [`envoyproxy/envoy:<hash>`](https://hub.docker.com/r/envoyproxy/envoy/) is an image that has an Envoy binary at `/usr/local/bin/envoy`. The `<hash>`
corresponds to the master commit at which the binary was compiled. Lastly, `envoyproxy/envoy:latest` contains an Envoy
corresponds to the master commit at which the binary was compiled. Lastly, `envoyproxy/envoy-dev:latest` contains an Envoy
binary built from the latest tip of master that passed tests.

## Alpine Envoy image
Expand Down
2 changes: 1 addition & 1 deletion configs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This configuration will build a Docker container containing
# an Envoy proxy that routes to Google.

FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest
RUN apt-get update
COPY google_com_proxy.v2.yaml /etc/envoy.yaml
CMD /usr/local/bin/envoy -c /etc/envoy.yaml
8 changes: 4 additions & 4 deletions docs/root/start/start.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ A very minimal Envoy configuration that can be used to validate basic plain HTTP
proxying is available in :repo:`configs/google_com_proxy.v2.yaml`. This is not
intended to represent a realistic Envoy deployment::

$ docker pull envoyproxy/envoy:latest
$ docker run --rm -d -p 10000:10000 envoyproxy/envoy:latest
$ docker pull envoyproxy/envoy-dev:latest
$ docker run --rm -d -p 10000:10000 envoyproxy/envoy-dev:latest
$ curl -v localhost:10000

The Docker image used will contain the latest version of Envoy
Expand Down Expand Up @@ -115,7 +115,7 @@ You can refer to the :ref:`Command line options <operations_cli>`.

.. code-block:: none

FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest
COPY envoy.yaml /etc/envoy/envoy.yaml

Build the Docker image that runs your configuration using::
Expand All @@ -138,7 +138,7 @@ by using a volume.
version: '3'
services:
envoy:
image: envoyproxy/envoy:latest
image: envoyproxy/envoy-dev:latest
ports:
- "10000:10000"
volumes:
Expand Down
2 changes: 1 addition & 1 deletion examples/cors/backend/Dockerfile-frontenvoy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
Expand Down
2 changes: 1 addition & 1 deletion examples/cors/frontend/Dockerfile-frontenvoy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
Expand Down
2 changes: 1 addition & 1 deletion examples/fault-injection/Dockerfile-envoy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get install -y curl tree
COPY enable_delay_fault_injection.sh disable_delay_fault_injection.sh enable_abort_fault_injection.sh disable_abort_fault_injection.sh send_request.sh /
2 changes: 1 addition & 1 deletion examples/front-proxy/Dockerfile-frontenvoy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-bridge/Dockerfile-grpc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest

RUN mkdir /var/log/envoy/
COPY ./bin/service /usr/local/bin/srv
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-bridge/Dockerfile-python
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest

RUN apt-get update
RUN apt-get -q install -y python-dev \
Expand Down
2 changes: 1 addition & 1 deletion examples/lua/Dockerfile-proxy
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest
CMD /usr/local/bin/envoy -c /etc/envoy.yaml -l debug --service-cluster proxy
2 changes: 1 addition & 1 deletion examples/mysql/Dockerfile-proxy
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest

CMD /usr/local/bin/envoy -c /etc/envoy.yaml -l debug
2 changes: 1 addition & 1 deletion examples/redis/Dockerfile-proxy
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM envoyproxy/envoy:latest
FROM envoyproxy/envoy-dev:latest
CMD /usr/local/bin/envoy -c /etc/envoy.yaml -l debug --service-cluster proxy