Skip to content

Fix CI for release/v1.18 #20223

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
mattklein123 merged 6 commits into from
Mar 16, 2022
Merged

Fix CI for release/v1.18 #20223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e4f904d
Backport #20038 to release/v1.21
phlax Feb 18, 2022
6e98ce5
Backport #20107 to release/v1.21
dependabot[bot] Feb 24, 2022
ffe82b1
ci: not using alpine image in examples (#19805)
lizan Feb 3, 2022
47afe51
Merge branch 'release/v1.18' into v1.18-fix_examples
RyanTheOptimist Mar 4, 2022
049fee9
Fix merge conflicts
RyanTheOptimist Mar 4, 2022
52bc5c6
examples: pin version of go-control-plane (#17553)
Jul 30, 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
4 changes: 2 additions & 2 deletions .github/workflows/codeql-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@75f07e7ab2ee63cba88752d8c696324e4df67466
# Override language selection by uncommenting this and choosing your languages
with:
languages: cpp
Expand All @@ -52,4 +52,4 @@ jobs:
git clean -xdf

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@75f07e7ab2ee63cba88752d8c696324e4df67466
4 changes: 2 additions & 2 deletions .github/workflows/codeql-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@75f07e7ab2ee63cba88752d8c696324e4df67466
# Override language selection by uncommenting this and choosing your languages
with:
languages: cpp
Expand Down Expand Up @@ -63,4 +63,4 @@ jobs:

- name: Perform CodeQL Analysis
if: env.BUILD_TARGETS != ''
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@75f07e7ab2ee63cba88752d8c696324e4df67466
4 changes: 2 additions & 2 deletions examples/cache/Dockerfile-service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM envoyproxy/envoy-alpine-dev:latest

RUN apk update && apk add py3-pip bash curl
RUN pip3 install -q Flask==0.11.1 requests==2.18.4 pyyaml
RUN apk update && apk add py3-pip
RUN pip3 install -q Flask==2.0.3 pyyaml
RUN mkdir /code
COPY ./start_service.sh /usr/local/bin/start_service.sh
COPY ./service-envoy.yaml /etc/service-envoy.yaml
Expand Down
4 changes: 2 additions & 2 deletions examples/cors/backend/Dockerfile-service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM envoyproxy/envoy-alpine-dev:latest

RUN apk update && apk add py3-pip bash
RUN pip3 install -q Flask==0.11.1
RUN apk update && apk add py3-pip
RUN pip3 install -q Flask==2.0.3
RUN mkdir /code
ADD ./service.py /code/
ADD ./start_service.sh /usr/local/bin/start_service.sh
Expand Down
4 changes: 2 additions & 2 deletions examples/cors/frontend/Dockerfile-service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM envoyproxy/envoy-alpine-dev:latest

RUN apk update && apk add py3-pip bash
RUN pip3 install -q Flask==0.11.1
RUN apk update && apk add py3-pip
RUN pip3 install -q Flask==2.0.3
RUN mkdir /code
ADD ./service.py ./index.html /code/
ADD ./start_service.sh /usr/local/bin/start_service.sh
Expand Down
4 changes: 2 additions & 2 deletions examples/csrf/crosssite/Dockerfile-service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM envoyproxy/envoy-alpine-dev:latest

RUN apk update && apk add py3-pip bash
RUN pip3 install -q Flask==0.11.1
RUN apk update && apk add py3-pip
RUN pip3 install -q Flask==2.0.3
RUN mkdir /code
ADD ./crosssite/service.py ./index.html /code/
ADD ./start_service.sh /usr/local/bin/start_service.sh
Expand Down
4 changes: 2 additions & 2 deletions examples/csrf/samesite/Dockerfile-service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM envoyproxy/envoy-alpine-dev:latest

RUN apk update && apk add py3-pip bash
RUN pip3 install -q Flask==0.11.1
RUN apk update && apk add py3-pip
RUN pip3 install -q Flask==2.0.3
RUN mkdir /code
ADD ./samesite/service.py ./index.html /code/
ADD ./start_service.sh /usr/local/bin/start_service.sh
Expand Down
2 changes: 1 addition & 1 deletion examples/double-proxy/Dockerfile-app
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM python:3.8-alpine

RUN apk update && apk add postgresql-dev gcc python3-dev musl-dev
RUN pip3 install -q Flask==0.11.1 requests==2.18.4 psycopg2-binary
RUN pip3 install -q Flask==2.0.3 requests==2.18.4 psycopg2-binary
RUN mkdir /code
ADD ./service.py /code
ENTRYPOINT ["python3", "/code/service.py"]
2 changes: 1 addition & 1 deletion examples/dynamic-config-cp/Dockerfile-control-plane
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ FROM golang
RUN apt-get -y update && apt-get install -y -qq --no-install-recommends netcat
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
RUN cd go-control-plane && git checkout b4adc3bb5fe5288bff01cd452dad418ef98c676e && make bin/example
WORKDIR /go/go-control-plane
2 changes: 1 addition & 1 deletion examples/ext_authz/upstream/service/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM python:3-alpine

RUN pip3 install -q Flask==0.11.1
RUN pip3 install -q Flask==2.0.3
COPY . ./app
CMD ["python3", "/app/service/server.py"]
6 changes: 3 additions & 3 deletions examples/front-proxy/Dockerfile-jaeger-service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM envoyproxy/envoy-alpine-dev:latest
FROM envoyproxy/envoy-dev:latest

RUN apk update && apk add py3-pip bash curl
RUN pip3 install -q Flask==0.11.1 requests==2.18.4
RUN apt-get update && apt-get -q install --no-install-recommends -y python3-pip curl
RUN pip3 install -q Flask==2.0.3 requests==2.18.4
RUN mkdir /code
ADD ./service.py /code
ADD ./start_service.sh /usr/local/bin/start_service.sh
Expand Down
6 changes: 3 additions & 3 deletions examples/front-proxy/Dockerfile-service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM envoyproxy/envoy-alpine-dev:latest
FROM envoyproxy/envoy-dev:latest

RUN apk update && apk add py3-pip bash curl
RUN pip3 install -q Flask==0.11.1 requests==2.18.4
RUN apt-get update && apt-get -q install --no-install-recommends -y python3-pip curl
RUN pip3 install -q Flask==2.0.3 requests==2.18.4
RUN mkdir /code
ADD ./service.py /code
ADD ./start_service.sh /usr/local/bin/start_service.sh
Expand Down
5 changes: 2 additions & 3 deletions examples/load-reporting-service/Dockerfile-http-server
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
FROM envoyproxy/envoy-alpine-dev:latest

RUN apk update && apk add py3-pip bash curl
RUN apk update && apk add py3-pip
RUN pip3 install -q Flask==2.0.3
RUN mkdir /code
ADD ./start_service.sh /usr/local/bin/start_service.sh
COPY . ./code

RUN pip3 install -q Flask==0.11.1

RUN chmod u+x /usr/local/bin/start_service.sh
ENTRYPOINT ["/bin/sh", "/usr/local/bin/start_service.sh"]