Skip to content

chore: Replace docker builder #814

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
kper wants to merge 10 commits into
base: master
Choose a base branch
from
+571 −286
Open

chore: Replace docker builder #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0309f4a
chore: Initial replacement of docker builder
kper Mar 14, 2026
0086bd0
chore: Use docker build caching
kper Mar 14, 2026
1552af8
chore: Make CheckStyle happy
kper Mar 14, 2026
08bb821
chore: Set logging for debugging
kper Mar 16, 2026
8f6d130
ci: Use image name and not image digest
kper Mar 17, 2026
ae416e0
ci: Delete container after completion
kper Mar 17, 2026
f655097
ci: Removed obsolete debugging flag
kper Mar 17, 2026
3d6afbe
ci: Use image key
kper Mar 17, 2026
1338214
ci: Improved logging
kper Mar 17, 2026
83f1efb
chore: Make Checkstyle happy
kper Mar 18, 2026
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
1 change: 1 addition & 0 deletions vadl/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies {
implementation("org.apache.commons:commons-text:1.10.0")

implementation("io.github.rascmatt:z3-bootstrap:1.0.0")
testImplementation("io.github.kper:buildkitcli:0.12.0")

testCompileOnly(project(":java-annotations"))
testImplementation(platform("org.junit:junit-bom:5.11.4"))
Expand Down
4 changes: 1 addition & 3 deletions vadl/main/resources/templates/lcb/LcbMakeFile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ build:
-DLLVM_PARALLEL_COMPILE_JOBS=$(LLVM_PARALLEL_COMPILE_JOBS) \
-DLLVM_PARALLEL_LINK_JOBS=$(LLVM_PARALLEL_LINK_JOBS) \
-DLLVM_CCACHE_BUILD=$(LLVM_CCACHE_BUILD) \
-DLLVM_ENABLE_ASSERTIONS=$(LLVM_ENABLE_ASSERTIONS) \
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache
-DLLVM_ENABLE_ASSERTIONS=$(LLVM_ENABLE_ASSERTIONS)
cmake --build $(LLVM_SOURCE_PATH)/build

build-llc:
Expand Down
1 change: 1 addition & 0 deletions vadl/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vadl.RemovingDockerImagesTeardown
7 changes: 5 additions & 2 deletions vadl/test/resources/images/lcb_execution_test_aarch64temp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# syntax=docker/dockerfile:1.7
FROM ghcr.io/openvadl/lcb-execution-test-aarch64-base-image@sha256:78d418708da2656805f7bac1204a1adc55f5a72f749b6d2100e275e176c816cf
ARG TARGET
ARG SCCACHE_REDIS_ENDPOINT
ARG UPSTREAM_BUILD_TARGET
ARG UPSTREAM_CLANG_TARGET
ARG SPIKE_TARGET
ARG ABI
LABEL key=VADL_TEST_CONTAINER
WORKDIR /llvm/build
ENV TARGET=${TARGET}
ENV UPSTREAM_CLANG_TARGET=${UPSTREAM_CLANG_TARGET}
ENV LLVM_UPSTREAM_TARGETS=${UPSTREAM_BUILD_TARGET}
ENV SCCACHE_REDIS_ENDPOINT=${SCCACHE_REDIS_ENDPOINT}
ENV SPIKE_TARGET=${SPIKE_TARGET}
ENV ABI=${ABI}
ENV SCCACHE_DIR=/root/.cache/sccache
ENV PATH=/opt/aarch64/bin:/opt/qemu/bin:$PATH
COPY . /src
WORKDIR /src
RUN make && sccache -s
RUN --mount=type=cache,target=/root/.cache/sccache make && sccache -s
RUN mkdir /output
CMD sh /work/compile.sh
CMD sh /work/compile.sh
7 changes: 5 additions & 2 deletions vadl/test/resources/images/lcb_execution_test_rv32im/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# syntax=docker/dockerfile:1.7
FROM ghcr.io/openvadl/lcb-execution-test-rv32im-base-image@sha256:cad1819961bae5b736649804f1ec1892b4a91966c3bd5460b343b12dfabe03af
ARG TARGET
ARG SCCACHE_REDIS_ENDPOINT
ARG UPSTREAM_BUILD_TARGET
ARG UPSTREAM_CLANG_TARGET
ARG SPIKE_TARGET
ARG ABI
LABEL key=VADL_TEST_CONTAINER
WORKDIR /llvm/build
ENV TARGET=${TARGET}
ENV UPSTREAM_CLANG_TARGET=${UPSTREAM_CLANG_TARGET}
ENV LLVM_UPSTREAM_TARGETS=${UPSTREAM_BUILD_TARGET}
ENV SCCACHE_REDIS_ENDPOINT=${SCCACHE_REDIS_ENDPOINT}
ENV SPIKE_TARGET=${SPIKE_TARGET}
ENV ABI=${ABI}
ENV SCCACHE_DIR=/root/.cache/sccache
ENV PATH=/opt/riscv/bin:/opt/qemu/bin:$PATH
COPY . /src
WORKDIR /src
RUN make && sccache -s
RUN --mount=type=cache,target=/root/.cache/sccache make && sccache -s
RUN mkdir /output
CMD sh /work/compile.sh
CMD sh /work/compile.sh
7 changes: 5 additions & 2 deletions vadl/test/resources/images/lcb_execution_test_rv64im/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
# syntax=docker/dockerfile:1.7
FROM ghcr.io/openvadl/lcb-execution-test-rv64im-base-image@sha256:45115bb0a22747dd8d347051d2bcb5ee084f568c90afbdf71ef738b0849afb96
ARG TARGET
ARG SCCACHE_REDIS_ENDPOINT
ARG UPSTREAM_BUILD_TARGET
ARG UPSTREAM_CLANG_TARGET
ARG SPIKE_TARGET
ARG ABI
LABEL key=VADL_TEST_CONTAINER
WORKDIR /llvm/build
ENV TARGET=${TARGET}
ENV UPSTREAM_CLANG_TARGET=${UPSTREAM_CLANG_TARGET}
ENV LLVM_UPSTREAM_TARGETS=${UPSTREAM_BUILD_TARGET}
ENV SCCACHE_REDIS_ENDPOINT=${SCCACHE_REDIS_ENDPOINT}
ENV SPIKE_TARGET=${SPIKE_TARGET}
ENV ABI=${ABI}
ENV SCCACHE_DIR=/root/.cache/sccache
ENV PATH=/opt/riscv/bin:/opt/qemu/bin:$PATH
COPY . /src
WORKDIR /src
RUN make && sccache -s
RUN --mount=type=cache,target=/root/.cache/sccache make && sccache -s
RUN mkdir /output
CMD sh /work/compile.sh
CMD sh /work/compile.sh
7 changes: 5 additions & 2 deletions vadl/test/resources/images/lcb_execution_test_varrisc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# syntax=docker/dockerfile:1.7
FROM ghcr.io/openvadl/llvm19-base@sha256:743dc3df521b6721ee4a74126aff198f40b6fc585d2c06b76869cabbb3d2c015

WORKDIR /work
Expand All @@ -9,6 +10,7 @@ ARG UPSTREAM_BUILD_TARGET
ARG UPSTREAM_CLANG_TARGET
ARG SPIKE_TARGET
ARG ABI
LABEL key=VADL_TEST_CONTAINER

WORKDIR /llvm/build

Expand All @@ -18,7 +20,8 @@ ENV LLVM_UPSTREAM_TARGETS=${UPSTREAM_BUILD_TARGET}
ENV SCCACHE_REDIS_ENDPOINT=${SCCACHE_REDIS_ENDPOINT}
ENV SPIKE_TARGET=${SPIKE_TARGET}
ENV ABI=${ABI}
ENV SCCACHE_DIR=/root/.cache/sccache
COPY . /src
WORKDIR /src
RUN make && sccache -s
RUN mkdir /output
RUN --mount=type=cache,target=/root/.cache/sccache make && sccache -s
RUN mkdir /output
1 change: 1 addition & 0 deletions vadl/test/resources/junit-platform.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
junit.jupiter.extensions.autodetection.enabled=true
1 change: 1 addition & 0 deletions vadl/test/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<!-- Testcontainers recommended logging profile -->
<logger name="org.testcontainers" level="INFO"/>
<logger name="io.github.kper.buildkitcli" level="DEBUG"/>
<logger name="tc" level="DEBUG"/>

<root level="${LOG_LEVEL}">
Expand Down
Loading
Loading