Skip to content

helpers for local development #518

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

Open
zmiklank wants to merge 1 commit into
base: release/v1.36
Choose a base branch
from
+27 −11
Open

helpers for local development #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions ci/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,23 +91,23 @@ services:
envoy-build:
<<: *envoy-build-base
volumes:
- ${ENVOY_DOCKER_BUILD_DIR:-/tmp/envoy-docker-build}:/build
- ${SOURCE_DIR:-..}:/source
- ${SHARED_TMP_DIR:-/tmp/bazel-shared}:${SHARED_TMP_DIR:-/tmp/bazel-shared}
- ${ENVOY_DOCKER_BUILD_DIR:-/tmp/envoy-docker-build}:/build:z
Copy link
Copy Markdown
Member

@jwendell jwendell Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this applicable on upstream (main branch at least)?

Copy link
Copy Markdown
Contributor Author

@zmiklank zmiklank Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup, I hope so. After some more testing I would like to contribute this upstream too.

Copy link
Copy Markdown
Member

@jwendell jwendell Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What kind of more tests? Remember, this is also upstream, used by other parties.

Copy link
Copy Markdown
Contributor Author

@zmiklank zmiklank Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to try to run this on Ubuntu.

- ${SOURCE_DIR:-..}:/source:z
- ${SHARED_TMP_DIR:-/tmp/bazel-shared}:${SHARED_TMP_DIR:-/tmp/bazel-shared}:z

envoy-build-gpg:
<<: *envoy-build-base
volumes:
- ${ENVOY_DOCKER_BUILD_DIR:-/tmp/envoy-docker-build}:/build
- ${SOURCE_DIR:-..}:/source
- ${ENVOY_GPG_DIR-${HOME}/.gnupg}:/build/.gnupg
- ${SHARED_TMP_DIR:-/tmp/bazel-shared}:${SHARED_TMP_DIR:-/tmp/bazel-shared}
- ${ENVOY_DOCKER_BUILD_DIR:-/tmp/envoy-docker-build}:/build:z
- ${SOURCE_DIR:-..}:/source:z
- ${ENVOY_GPG_DIR-${HOME}/.gnupg}:/build/.gnupg:z
- ${SHARED_TMP_DIR:-/tmp/bazel-shared}:${SHARED_TMP_DIR:-/tmp/bazel-shared}:z

envoy-build-dind:
privileged: true
<<: *envoy-build-base
volumes:
- ${ENVOY_DOCKER_BUILD_DIR:-/tmp/envoy-docker-build}:/build
- ${SOURCE_DIR:-..}:/source
- /var/run/docker.sock:/var/run/docker.sock
- ${SHARED_TMP_DIR:-/tmp/bazel-shared}:${SHARED_TMP_DIR:-/tmp/bazel-shared}
- ${ENVOY_DOCKER_BUILD_DIR:-/tmp/envoy-docker-build}:/build:z
- ${SOURCE_DIR:-..}:/source:z
- /var/run/docker.sock:/var/run/docker.sock:z
- ${SHARED_TMP_DIR:-/tmp/bazel-shared}:${SHARED_TMP_DIR:-/tmp/bazel-shared}:z
16 changes: 16 additions & 0 deletions openssl/run_envoy_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

set -x
set -euo pipefail

# Change to the top dir
cd "$(dirname "$0")/.."

# Build with libstdc++ rather than libc++ because the bssl-compat prefixer tool
# is linked against some of the LLVM libraries which require libstdc++
export ENVOY_STDLIB=libstdc++

# Tell the upstream run_envoy_docker.sh script to use our builder image
export ENVOY_BUILD_IMAGE=$(grep ENVOY_BUILD_IMAGE .github/workflows/envoy-openssl.yml | awk '{print $2}')
# Hand off to the upstream run_envoy_docker.sh script
exec ./ci/run_envoy_docker.sh "$@"
Loading