Skip to content
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.

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

[backport/1.25] Backport stack #26945

Merged
merged 2 commits into from
Apr 26, 2023
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
9 changes: 8 additions & 1 deletion examples/websocket/Dockerfile-websocat
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
FROM solsson/websocat@sha256:902f0b3a263fd274fc1acf24e95c7226071075b42775894205285fd894188120
FROM debian:bullseye-slim@sha256:9404b05bd09b57c76eccc0c5505b3c88b5feccac808d9b193a4fbac87bb44745 as websocket-base
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update \
&& apt-get -qq install --no-install-recommends -y ca-certificates musl wget
RUN wget -qO /usr/local/bin/websocat https://github.com/vi/websocat/releases/download/v1.11.0/websocat.x86_64-unknown-linux-musl \
&& echo 'dc5524b9f03a344b88a12c859fb02f8bb56b3373dbc43a6e0c45a2ab52b853d7 /usr/local/bin/websocat' | sha256sum -c - \
&& chmod +x /usr/local/bin/websocat
ENTRYPOINT ["websocat"]
17 changes: 7 additions & 10 deletions examples/websocket/Dockerfile-websocat-client
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
FROM solsson/websocat@sha256:902f0b3a263fd274fc1acf24e95c7226071075b42775894205285fd894188120

FROM debian:bullseye-slim@sha256:9404b05bd09b57c76eccc0c5505b3c88b5feccac808d9b193a4fbac87bb44745 as websocket-base
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get -qq update \
&& apt-get -qq install --no-install-recommends -y ca-certificates musl wget
RUN wget -qO /usr/local/bin/websocat https://github.com/vi/websocat/releases/download/v1.11.0/websocat.x86_64-unknown-linux-musl \
&& echo 'dc5524b9f03a344b88a12c859fb02f8bb56b3373dbc43a6e0c45a2ab52b853d7 /usr/local/bin/websocat' | sha256sum -c - \
&& chmod +x /usr/local/bin/websocat
ADD interact.sh /interact.sh
RUN chmod +x /interact.sh

RUN apt-get -qq update \
&& apt-get -qq install -qq --no-install-recommends -y expect \
&& apt-get -qq autoremove -y && apt-get clean \
&& rm -rf /tmp/* /var/tmp/* \
&& rm -rf /var/lib/apt/lists/*


&& apt-get -qq install --no-install-recommends -y expect
ENTRYPOINT ["/interact.sh"]
3 changes: 2 additions & 1 deletion test/common/filesystem/filesystem_impl_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ TEST_F(FileSystemImplTest, FileReadToEndDoesNotExist) {

#ifndef WIN32
// In Windows this method of removing the permissions does not make read fail.
TEST_F(FileSystemImplTest, FileReadToEndNotReadable) {
// Issue https://github.com/envoyproxy/envoy/issues/25614, disabling this test
TEST_F(FileSystemImplTest, DISABLED_FileReadToEndNotReadable) {
const std::string data = "test string\ntest";
const std::string file_path = TestEnvironment::writeStringToFileForTest("test_envoy", data);

Expand Down
1 change: 1 addition & 0 deletions test/per_file_coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ declare -a KNOWN_LOW_COVERAGE=(
"source/common/config:96.4"
"source/common/crypto:88.1"
"source/common/event:95.1" # Emulated edge events guards don't report LCOV
"source/common/filesystem/posix:96.5" # FileReadToEndNotReadable keeps failing
"source/common/http:96.1"
"source/common/http/http2:94.8"
"source/common/json:93.4"
Expand Down