diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml index 358695c84f61c..1badcf748209e 100644 --- a/.github/workflows/codeql-daily.yml +++ b/.github/workflows/codeql-daily.yml @@ -26,7 +26,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@a66b44a48a44d63acf71688c56aa168ac171d4cf # v1 + uses: github/codeql-action/init@75f07e7ab2ee63cba88752d8c696324e4df67466 # Override language selection by uncommenting this and choosing your languages with: languages: cpp @@ -53,4 +53,4 @@ jobs: git clean -xdf - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@a66b44a48a44d63acf71688c56aa168ac171d4cf # v1 + uses: github/codeql-action/analyze@75f07e7ab2ee63cba88752d8c696324e4df67466 diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml index d79e7a011d347..f3936374311bc 100644 --- a/.github/workflows/codeql-push.yml +++ b/.github/workflows/codeql-push.yml @@ -34,7 +34,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@a66b44a48a44d63acf71688c56aa168ac171d4cf # v1 + uses: github/codeql-action/init@75f07e7ab2ee63cba88752d8c696324e4df67466 # Override language selection by uncommenting this and choosing your languages with: languages: cpp @@ -64,4 +64,4 @@ jobs: - name: Perform CodeQL Analysis if: env.BUILD_TARGETS != '' - uses: github/codeql-action/analyze@a66b44a48a44d63acf71688c56aa168ac171d4cf # v1 + uses: github/codeql-action/analyze@75f07e7ab2ee63cba88752d8c696324e4df67466 diff --git a/examples/brotli/Dockerfile-service b/examples/brotli/Dockerfile-service index 4712019f501b6..c9103f91a32a8 100644 --- a/examples/brotli/Dockerfile-service +++ b/examples/brotli/Dockerfile-service @@ -1,11 +1,11 @@ FROM debian:buster-slim RUN apt-get update \ - && apt-get install --no-install-recommends -y python3 python3-pip \ + && apt-get install --no-install-recommends -y python3 python3-pip python3-setuptools \ && apt-get autoremove -y && apt-get clean \ && rm -rf /tmp/* /var/tmp/* \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install -q flask +RUN pip3 install -q Flask==2.0.3 RUN mkdir -p /code/data RUN dd if=/dev/zero of="/code/data/file.txt" bs=1024 count=10240 \ && dd if=/dev/zero of="/code/data/file.json" bs=1024 count=10240 diff --git a/examples/cache/Dockerfile-service b/examples/cache/Dockerfile-service index a05db06f5e243..6c9a7f939fe8d 100644 --- a/examples/cache/Dockerfile-service +++ b/examples/cache/Dockerfile-service @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk update && apk add py3-pip -RUN pip3 install -q Flask==0.11.1 pyyaml +RUN pip3 install -q Flask==2.0.3 pyyaml RUN mkdir /code COPY ./service.py /code CMD ["python3", "/code/service.py"] diff --git a/examples/cors/backend/Dockerfile-service b/examples/cors/backend/Dockerfile-service index 4b98a80704dc7..e5fb609c85395 100644 --- a/examples/cors/backend/Dockerfile-service +++ b/examples/cors/backend/Dockerfile-service @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk update && apk add py3-pip -RUN pip3 install -q Flask==0.11.1 +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code ADD ./service.py /code/ diff --git a/examples/cors/frontend/Dockerfile-service b/examples/cors/frontend/Dockerfile-service index 85dba2382f99e..704184b2ac3ae 100644 --- a/examples/cors/frontend/Dockerfile-service +++ b/examples/cors/frontend/Dockerfile-service @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk update && apk add py3-pip -RUN pip3 install -q Flask==0.11.1 +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code ADD ./service.py ./index.html /code/ diff --git a/examples/csrf/crosssite/Dockerfile-service b/examples/csrf/crosssite/Dockerfile-service index 873f00e042460..60a57011cf803 100644 --- a/examples/csrf/crosssite/Dockerfile-service +++ b/examples/csrf/crosssite/Dockerfile-service @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk update && apk add py3-pip -RUN pip3 install -q Flask==0.11.1 +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code ADD ./crosssite/service.py ./index.html /code/ CMD ["python3", "/code/service.py"] diff --git a/examples/csrf/samesite/Dockerfile-service b/examples/csrf/samesite/Dockerfile-service index 17fd1f51a6dca..bc035fa1e5648 100644 --- a/examples/csrf/samesite/Dockerfile-service +++ b/examples/csrf/samesite/Dockerfile-service @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk update && apk add py3-pip -RUN pip3 install -q Flask==0.11.1 +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code ADD ./samesite/service.py ./index.html /code/ CMD ["python3", "/code/service.py"] diff --git a/examples/double-proxy/Dockerfile-app b/examples/double-proxy/Dockerfile-app index f843db1f8a53a..0e6f664dc63e5 100644 --- a/examples/double-proxy/Dockerfile-app +++ b/examples/double-proxy/Dockerfile-app @@ -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"] diff --git a/examples/ext_authz/upstream/service/Dockerfile b/examples/ext_authz/upstream/service/Dockerfile index 5f70f40aca7c6..9cd53e82641de 100644 --- a/examples/ext_authz/upstream/service/Dockerfile +++ b/examples/ext_authz/upstream/service/Dockerfile @@ -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"] diff --git a/examples/front-proxy/Dockerfile-jaeger-service b/examples/front-proxy/Dockerfile-jaeger-service index f8bbf13b03e03..4a38c6efff76f 100644 --- a/examples/front-proxy/Dockerfile-jaeger-service +++ b/examples/front-proxy/Dockerfile-jaeger-service @@ -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 diff --git a/examples/front-proxy/Dockerfile-service b/examples/front-proxy/Dockerfile-service index 0c2ae43024fa2..86fdf2b667b4a 100644 --- a/examples/front-proxy/Dockerfile-service +++ b/examples/front-proxy/Dockerfile-service @@ -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 diff --git a/examples/gzip/Dockerfile-service b/examples/gzip/Dockerfile-service index 4712019f501b6..c9103f91a32a8 100644 --- a/examples/gzip/Dockerfile-service +++ b/examples/gzip/Dockerfile-service @@ -1,11 +1,11 @@ FROM debian:buster-slim RUN apt-get update \ - && apt-get install --no-install-recommends -y python3 python3-pip \ + && apt-get install --no-install-recommends -y python3 python3-pip python3-setuptools \ && apt-get autoremove -y && apt-get clean \ && rm -rf /tmp/* /var/tmp/* \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install -q flask +RUN pip3 install -q Flask==2.0.3 RUN mkdir -p /code/data RUN dd if=/dev/zero of="/code/data/file.txt" bs=1024 count=10240 \ && dd if=/dev/zero of="/code/data/file.json" bs=1024 count=10240 diff --git a/examples/load-reporting-service/Dockerfile-http-server b/examples/load-reporting-service/Dockerfile-http-server index a63927fbd8046..a1dc60c1d81ff 100644 --- a/examples/load-reporting-service/Dockerfile-http-server +++ b/examples/load-reporting-service/Dockerfile-http-server @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk update && apk add py3-pip -RUN pip3 install -q Flask==0.11.1 +RUN pip3 install -q Flask==2.0.3 RUN mkdir /code COPY ./service.py ./code diff --git a/examples/win32-front-proxy/Dockerfile-service b/examples/win32-front-proxy/Dockerfile-service index a347d8c3189fc..925bf95e6c962 100644 --- a/examples/win32-front-proxy/Dockerfile-service +++ b/examples/win32-front-proxy/Dockerfile-service @@ -3,7 +3,7 @@ FROM envoyproxy/envoy-windows-dev:latest COPY ./setup_python.ps1 / RUN powershell.exe .\\setup_python.ps1 -RUN pip3 install -q Flask==0.11.1 requests==2.18.4 +RUN pip3 install -q Flask==2.0.3 requests==2.18.4 RUN powershell mkdir code ADD ./service.py ./code