Skip to content

examples: unify apt and cleanup unused installation #16519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phlax merged 4 commits into from
May 19, 2021
Merged

examples: unify apt and cleanup unused installation #16519

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c6b944
exmaples: unify apt and cleanup useless installation
daixiang0 May 17, 2021
7fc57bc
feedback
daixiang0 May 18, 2021
84e1ea3
fix typos
daixiang0 May 18, 2021
4c6e7ef
fix typo
daixiang0 May 18, 2021
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: 0 additions & 2 deletions examples/cache/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
COPY ./front-envoy.yaml /etc/front-envoy.yaml
RUN chmod go+r /etc/front-envoy.yaml
CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy
2 changes: 0 additions & 2 deletions examples/cors/backend/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
COPY ./front-envoy.yaml /etc/front-envoy.yaml
RUN chmod go+r /etc/front-envoy.yaml
CMD ["/usr/local/bin/envoy", "-c", "/etc/front-envoy.yaml", "--service-cluster", "front-proxy"]
2 changes: 0 additions & 2 deletions examples/cors/frontend/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
COPY ./front-envoy.yaml /etc/front-envoy.yaml
RUN chmod go+r /etc/front-envoy.yaml
CMD ["/usr/local/bin/envoy", "-c", "/etc/front-envoy.yaml", "--service-cluster", "front-proxy"]
2 changes: 0 additions & 2 deletions examples/csrf/crosssite/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
COPY ./front-envoy.yaml /etc/front-envoy.yaml
RUN chmod go+r /etc/front-envoy.yaml
CMD ["/usr/local/bin/envoy", "-c", "/etc/front-envoy.yaml", "--service-cluster", "front-proxy"]
2 changes: 0 additions & 2 deletions examples/csrf/samesite/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
COPY ./front-envoy.yaml /etc/front-envoy.yaml
RUN chmod go+r /etc/front-envoy.yaml
CMD ["/usr/local/bin/envoy", "-c", "/etc/front-envoy.yaml", "--service-cluster", "front-proxy"]
7 changes: 6 additions & 1 deletion examples/dynamic-config-cp/Dockerfile-control-plane
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
FROM golang

RUN apt-get -y update && apt-get install -y -qq --no-install-recommends netcat
Comment thread
daixiang0 marked this conversation as resolved.
RUN apt-get update \
Comment thread
daixiang0 marked this conversation as resolved.
Outdated
&& apt-get install --no-install-recommends -y curl \
Comment thread
daixiang0 marked this conversation as resolved.
Outdated
&& apt-get autoremove -y \
&& apt-get clean \
&& rm -rf /tmp/* /var/tmp/* rm -rf /var/lib/apt/lists/*
Comment thread
daixiang0 marked this conversation as resolved.
Outdated

RUN git clone https://github.com/envoyproxy/go-control-plane
ADD ./resource.go /go/go-control-plane/internal/example/resource.go
RUN cd go-control-plane && make bin/example
Expand Down
1 change: 0 additions & 1 deletion examples/dynamic-config-cp/Dockerfile-proxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get -y update && apt-get install -y -qq --no-install-recommends netcat
COPY ./envoy.yaml /etc/envoy.yaml
RUN chmod go+r /etc/envoy.yaml
CMD ["/usr/local/bin/envoy", "-c /etc/envoy.yaml", "-l", "debug"]
2 changes: 0 additions & 2 deletions examples/ext_authz/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
COPY ./config /etc/envoy-config
COPY ./run_envoy.sh /run_envoy.sh
RUN chmod go+r -R /etc/envoy-config \
Expand Down
6 changes: 5 additions & 1 deletion examples/fault-injection/Dockerfile-envoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get install -y curl tree
RUN apt-get update \
&& apt-get install --no-install-recommends -y tree curl \
&& apt-get autoremove -y \
&& apt-get clean \
&& rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/*
COPY ./envoy.yaml /etc/envoy.yaml
RUN chmod go+r /etc/envoy.yaml
COPY enable_delay_fault_injection.sh disable_delay_fault_injection.sh enable_abort_fault_injection.sh disable_abort_fault_injection.sh send_request.sh /
7 changes: 5 additions & 2 deletions examples/front-proxy/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
RUN apt-get update \
&& apt-get install --no-install-recommends -y curl \
&& apt-get autoremove -y \
&& apt-get clean \
&& rm -rf /tmp/* /var/tmp/* rm -rf /var/lib/apt/lists/*
Comment thread
daixiang0 marked this conversation as resolved.
Outdated
COPY ./front-envoy.yaml /etc/front-envoy.yaml
RUN chmod go+r /etc/front-envoy.yaml
CMD ["/usr/local/bin/envoy", "-c", "/etc/front-envoy.yaml", "--service-cluster", "front-proxy"]
8 changes: 6 additions & 2 deletions examples/jaeger-native-tracing/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
Comment thread
daixiang0 marked this conversation as resolved.
RUN apt-get update \
&& apt-get install --no-install-recommends -y curl \
&& apt-get autoremove -y \
&& apt-get clean \
&& rm -rf /tmp/* /var/tmp/* rm -rf /var/lib/apt/lists/*
Comment thread
daixiang0 marked this conversation as resolved.
Outdated

COPY ./front-envoy-jaeger.yaml /etc/front-envoy.yaml
#
# for discussion on jaeger binary compatibility, and the source of the file, see here:
Expand Down
2 changes: 0 additions & 2 deletions examples/skywalking-tracing/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
COPY ./front-envoy-skywalking.yaml /etc/front-envoy.yaml
RUN chmod go+r /etc/front-envoy.yaml
CMD /usr/local/bin/envoy -c /etc/front-envoy.yaml --service-cluster front-proxy
2 changes: 0 additions & 2 deletions examples/zipkin-tracing/Dockerfile-frontenvoy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM envoyproxy/envoy-dev:latest

RUN apt-get update && apt-get -q install -y \
curl
COPY ./front-envoy-zipkin.yaml /etc/front-envoy.yaml
RUN chmod go+r /etc/front-envoy.yaml
CMD ["/usr/local/bin/envoy", "-c", "/etc/front-envoy.yaml", "--service-cluster", "front-proxy"]