-
Notifications
You must be signed in to change notification settings - Fork 73
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
feat: Allow copa to use buildkit from dockerd #233
Merged
sozercan
merged 3 commits into
project-copacetic:main
from
cpuguy83:try_docker_buildkit
Aug 15, 2023
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -eu -o pipefail | ||
|
|
||
| SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" | ||
|
|
||
| # Collect all the modes into a bash array | ||
| modes=() | ||
| for i in ${SCRIPT_DIR}/buildkitenvs/*; do | ||
| base="${i##*/}" | ||
| for j in "${i}"/*; do | ||
| modes+=(${base}/${j##*/}) | ||
| done | ||
| done | ||
|
|
||
| # Convert bash array to json | ||
| jq -c --null-input '$ARGS.positional' --args -- "${modes[@]}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/usr/bin/env sh | ||
|
|
||
| docker buildx create --use | ||
| docker buildx inspect --bootstrap | ||
| export COPA_BUILDKIT_ADDR="buildx://" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #!/usr/bin/env sh | ||
|
|
||
| docker buildx create --name testpatch | ||
| docker buildx inspect --bootstrap testpatch | ||
| export COPA_BUILDKIT_ADDR="buildx://testpatch" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #!/usr/bin/env sh | ||
|
|
||
|
|
||
| : "${BUILDKIT_PORT:=30321}" | ||
| : "${BUILDKIT_VERSION=0.12.0}" | ||
|
|
||
| _buildkit_direct_tcp_id="$(docker run --detach --rm --privileged -p 127.0.0.1::${BUILDKIT_PORT}/tcp --entrypoint buildkitd "moby/buildkit:v$BUILDKIT_VERSION" --addr tcp://0.0.0.0:${BUILDKIT_PORT})" | ||
| _buildkitd_tcp_addr="$(docker port ${_buildkit_direct_tcp_id} ${BUILDKIT_PORT})" | ||
| export COPA_BUILDKIT_ADDR="tcp://${_buildkitd_tcp_addr}" | ||
|
|
||
| _cleanup() { | ||
| docker rm -f "${_buildkit_direct_tcp_id}" | ||
| } | ||
|
|
||
| trap '_cleanup' EXIT | ||
|
|
||
| _check_buildkitd_tcp() { | ||
| buildctl --addr ${COPA_BUILDKIT_ADDR} debug info | ||
| } | ||
|
|
||
| echo "[INFO] Wait for buildkitd to be ready @ ${COPA_BUILDKIT_ADDR}" | ||
| while ! _check_buildkitd_tcp; do | ||
| sleep 1 | ||
| done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| #!/usr/bin/env sh | ||
|
|
||
| # dockerd requires containerd snapshotter support to be enabled otherwise required features for buildkit are disabled. | ||
| docker build -t dind -<<EOF | ||
| FROM docker:24.0-dind | ||
| RUN mkdir -p /etc/docker && echo '{"features": { "containerd-snapshotter": true }}' > /etc/docker/daemon.json | ||
| ENTRYPOINT ["dockerd"] | ||
| EOF | ||
|
|
||
| : "${DOCKER_DIND_VOLUME:="copa-docker-dind"}" | ||
|
|
||
| sock_dir="$(mktemp -d)" | ||
|
|
||
| docker_custom_unix_id="$(docker run -d --privileged --mount=type=bind,source="${sock_dir}",target=/run --mount=type=volume,source="${DOCKER_DIND_VOLUME}",target=/var/lib/docker dind --group "$(id -g)")" | ||
|
|
||
| _cleanup() { | ||
| docker rm -f "$docker_custom_unix_id" | ||
| sudo rm -rf "${sock_dir}" | ||
| } | ||
|
|
||
| trap '_cleanup' EXIT | ||
|
|
||
| _check_docker_dind() { | ||
| docker -H "unix://${sock_dir}/docker.sock" info | ||
| } | ||
|
|
||
| while ! _check_docker_dind; do | ||
| check_docker_dind || sleep 1 | ||
| done | ||
|
|
||
| export COPA_BUILDKIT_ADDR="docker://unix://${sock_dir}/docker.sock" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -eu -o pipefail | ||
|
|
||
| curl -sfL https://github.com/aquasecurity/trivy/releases/download/v${TRIVY_VERSION}/trivy_${TRIVY_VERSION}_Linux-64bit.deb -o trivy.deb | ||
| sudo dpkg -i trivy.deb | ||
| rm trivy.deb | ||
|
|
||
| curl -sfL https://github.com/moby/buildkit/releases/download/v${BUILDKIT_VERSION}/buildkit-v${BUILDKIT_VERSION}.linux-amd64.tar.gz -o buildkit.tar.gz | ||
| sudo tar -zxvf buildkit.tar.gz -C /usr/local/ | ||
| rm buildkit.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package trivy | ||
|
|
||
| import data.lib.trivy | ||
|
|
||
| default ignore = false | ||
|
|
||
| ignore_vulnerability_ids := { | ||
| # centos 7.6.1810 | ||
| # bind-license package version "9.11.4-26.P2.el7_9.14" does not exist | ||
| "CVE-2023-2828" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package integration | ||
|
|
||
| import ( | ||
| "flag" | ||
| "os" | ||
| "testing" | ||
| ) | ||
|
|
||
| var ( | ||
| buildkitAddr string | ||
| copaPath string | ||
| ) | ||
|
|
||
| func TestMain(m *testing.M) { | ||
| flag.StringVar(&buildkitAddr, "addr", "", "buildkit address to pass through to copa binary") | ||
| flag.StringVar(&copaPath, "copa", "./copa", "path to copa binary") | ||
| flag.Parse() | ||
|
|
||
| if copaPath == "" { | ||
| panic("missing --copa") | ||
| } | ||
|
|
||
| ec := m.Run() | ||
| os.Exit(ec) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we want to align on sh or bash?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's nothing bashy-in here, really the line is to make my editor load the right toolset.
Otherwise totally fine to throw either sh or bash in there.