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

Zalimeni/recreate envoy bump version fix #632

Closed
wants to merge 2 commits into from
Closed
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
3 changes: 3 additions & 0 deletions .changelog/630.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-notes:bug
changelog
```
10 changes: 9 additions & 1 deletion .github/scripts/check_skip_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ set -euo pipefail
#
# ... `git merge-base origin/$SKIP_CHECK_BRANCH HEAD` would return commit `D`
# `...HEAD` specifies from the common ancestor to the latest commit on the current branch (HEAD)..
files_to_check=$(git diff --name-only "$(git merge-base origin/$SKIP_CHECK_BRANCH HEAD~)"...HEAD)
skip_check_branch=${SKIP_CHECK_BRANCH:?SKIP_CHECK_BRANCH is required}

git log -n3 --pretty=oneline

echo "skip check branch: $skip_check_branch"
echo "git merge-base origin/$skip_check_branch origin/main: $(git merge-base origin/$skip_check_branch origin/main)"
echo "git diff --name-only $(git merge-base origin/$skip_check_branch origin/main)...HEAD: $(git diff --name-only "$(git merge-base origin/$skip_check_branch origin/main)"...HEAD)"

files_to_check=$(git diff --name-only "$(git merge-base origin/$skip_check_branch origin/main)"...HEAD)

# Define the directories to check
skipped_directories=("_doc/" ".changelog/")
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# prebuilt binaries in any other form.
#
ARG GOLANG_VERSION
FROM envoyproxy/envoy-distroless:v1.31.2 as envoy-binary
FROM envoyproxy/envoy-distroless:v1.31.1 as envoy-binary

# Modify the envoy binary to be able to bind to privileged ports (< 1024).
FROM debian:bullseye-slim AS setcap-envoy-binary
Expand All @@ -27,7 +27,7 @@ RUN apt-get update && apt install -y libcap2-bin
RUN setcap CAP_NET_BIND_SERVICE=+ep /usr/local/bin/envoy
RUN setcap CAP_NET_BIND_SERVICE=+ep /usr/local/bin/$BIN_NAME

FROM hashicorp/envoy-fips:1.31.2-fips1402 as envoy-fips-binary
FROM hashicorp/envoy-fips:1.31.1-fips1402 as envoy-fips-binary

# Modify the envoy-fips binary to be able to bind to privileged ports (< 1024).
FROM debian:bullseye-slim AS setcap-envoy-fips-binary
Expand Down
Loading