-
Notifications
You must be signed in to change notification settings - Fork 23
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
build: add Dockerfile for controller, build with bottlerocket-sdk #85
Merged
Merged
Changes from all commits
Commits
Show all changes
2 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
Large diffs are not rendered by default.
Oops, something went wrong.
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,29 @@ | ||
ARG ARCH | ||
FROM public.ecr.aws/bottlerocket/bottlerocket-sdk-${ARCH}:v0.22.0 as build | ||
ARG ARCH | ||
ARG OPENSSL_VERSION=1.1.1k | ||
ARG OPENSSL_SHA256SUM=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 | ||
USER root | ||
|
||
# Build openssl using musl toolchain for openssl-sys crate | ||
RUN dnf install -y perl | ||
RUN mkdir /musl && \ | ||
echo "/musl/lib" >> /etc/ld-musl-${ARCH}.path && \ | ||
ln -s /usr/include/${ARCH}-linux-gnu/asm /${ARCH}-bottlerocket-linux-musl/sys-root/usr/include/asm && \ | ||
ln -s /usr/include/asm-generic /${ARCH}-bottlerocket-linux-musl/sys-root/usr/include/asm-generic && \ | ||
ln -s /usr/include/linux /${ARCH}-bottlerocket-linux-musl/sys-root/usr/include/linux | ||
|
||
RUN curl -O -sSL https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \ | ||
echo "${OPENSSL_SHA256SUM} openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum --check && \ | ||
tar -xzf openssl-${OPENSSL_VERSION}.tar.gz && \ | ||
cd openssl-${OPENSSL_VERSION} && \ | ||
./Configure no-shared no-async -fPIC --prefix=/musl --openssldir=/musl/ssl linux-${ARCH} && \ | ||
env C_INCLUDE_PATH=/musl/include/ make depend 2> /dev/null && \ | ||
make -j && \ | ||
make install && \ | ||
cd .. && rm -rf openssl-${OPENSSL_VERSION} | ||
|
||
# We need these environment variables set for building the `openssl-sys` crate | ||
ENV PKG_CONFIG_ALLOW_CROSS=1 | ||
ENV OPENSSL_STATIC=true | ||
ENV OPENSSL_DIR=/musl | ||
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 |
---|---|---|
@@ -1,8 +1,25 @@ | ||
.PHONY: example-test-agent-container | ||
.PHONY: sdk-openssl example-test-agent-image controller-image images | ||
|
||
# Build a container image for daemon and tools. | ||
example-test-agent-container: | ||
docker build \ | ||
--network=host \ | ||
--tag 'example_test_agent' \ | ||
ARCH=$(shell uname -m) | ||
|
||
images: controller-image | ||
|
||
# Augment the bottlerocket-sdk image with openssl built with the musl toolchain | ||
sdk-openssl: | ||
webern marked this conversation as resolved.
Show resolved
Hide resolved
|
||
docker build $(DOCKER_BUILD_FLAGS) \ | ||
--build-arg ARCH="$(ARCH)" \ | ||
--tag "bottlerocket-sdk-openssl-$(ARCH)" \ | ||
-f Dockerfile.sdk_openssl . | ||
|
||
# Build the container image for the example test-agent program | ||
example-test-agent-image: sdk-openssl | ||
docker build $(DOCKER_BUILD_FLAGS) \ | ||
--build-arg ARCH="$(ARCH)" \ | ||
--tag "example-testsys-agent" \ | ||
-f test-agent/examples/example_test_agent/Dockerfile . | ||
|
||
controller-image: sdk-openssl | ||
docker build $(DOCKER_BUILD_FLAGS) \ | ||
--build-arg ARCH="$(ARCH)" \ | ||
--tag "testsys-controller" \ | ||
-f controller/Dockerfile . |
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
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,16 @@ | ||
ARG ARCH | ||
FROM bottlerocket-sdk-openssl-${ARCH} as build | ||
ARG ARCH | ||
USER root | ||
|
||
ADD ./ /src/ | ||
WORKDIR /src/controller | ||
RUN cargo install --locked --target ${ARCH}-bottlerocket-linux-musl --path . --root ./ | ||
|
||
FROM scratch | ||
# Copy CA certificates store | ||
COPY --from=public.ecr.aws/amazonlinux/amazonlinux:2 /etc/ssl /etc/ssl | ||
COPY --from=public.ecr.aws/amazonlinux/amazonlinux:2 /etc/pki /etc/pki | ||
COPY --from=build /src/controller/bin/controller ./ | ||
|
||
ENTRYPOINT ["./controller"] |
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 |
---|---|---|
@@ -1,7 +1,16 @@ | ||
# TODO Use Bottlerocket SDK | ||
FROM rust:1.53.0 | ||
WORKDIR /src | ||
ARG ARCH | ||
FROM bottlerocket-sdk-openssl-${ARCH} as build | ||
ARG ARCH | ||
USER root | ||
|
||
ADD ./ /src/ | ||
WORKDIR /src/test-agent | ||
RUN cargo install --path . --example example_test_agent --root ./ | ||
ENTRYPOINT ["/src/test-agent/bin/example_test_agent"] | ||
RUN cargo install --locked --target ${ARCH}-bottlerocket-linux-musl --path . --example example_test_agent --root ./ | ||
|
||
FROM scratch | ||
# Copy CA certificates store | ||
COPY --from=public.ecr.aws/amazonlinux/amazonlinux:2 /etc/ssl /etc/ssl | ||
COPY --from=public.ecr.aws/amazonlinux/amazonlinux:2 /etc/pki /etc/pki | ||
COPY --from=build /src/test-agent/bin/example_test_agent ./ | ||
|
||
ENTRYPOINT ["./example_test_agent"] |
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
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.
Nit: Shouldn't
ENV
s be closer toARG
s?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.
I don't think it's absolutely necessary since it's not used for building openssl. These are environment variables we should set after we're able to successfully build openssl with musl. It's intended for building the openssl-sys crate later when we build the controller image. I'll add a comment here to indicate what these environment variables are for.