From 16ffb9e6dc035556f86d08df7489676de2650307 Mon Sep 17 00:00:00 2001 From: Kale-Ko Date: Tue, 4 Jun 2024 23:19:43 -0400 Subject: [PATCH] Run completebuild in docker too --- .github/workflows/maven.yml | 24 ++++++++++++++++++++++-- docker/{ => build}/Dockerfile | 0 docker/completebuild/Dockerfile | 17 +++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) rename docker/{ => build}/Dockerfile (100%) create mode 100644 docker/completebuild/Dockerfile diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fa73cfbb..5b31105b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -72,10 +72,12 @@ jobs: --build-arg "TARGET_GCC_PACKAGE=${{ matrix.architecture.gcc_package_name }}" \ --build-arg "TARGET_GCC_EXEC=${{ matrix.architecture.gcc_exec_name }}" \ --tag linux-buildimage:${{ matrix.architecture.name }} \ - docker/ + docker/build/ - name: Build run: | + chmod +x ./mvnw ./mvnw.cmd + export MAVEN_HOME=$(dirname $(dirname $(which mvn))) docker run \ @@ -210,6 +212,15 @@ jobs: architecture: 'x64' check-latest: true + - name: Setup Docker + run: | + docker build \ + --platform linux/amd64 \ + --build-arg "UBUNTU_VERSION=18.04" \ + --build-arg "JAVA_VERSION=${{ matrix.java_version }}" \ + --tag linux-buildimage:complete \ + docker/completebuild/ + - name: Download builds uses: actions/download-artifact@v4 with: @@ -237,7 +248,16 @@ jobs: - name: Build run: | chmod +x ./mvnw ./mvnw.cmd - ./mvnw -B -V -ntp -P "release" "-Dmaven.test.skip=true" package + + export MAVEN_HOME=$(dirname $(dirname $(which mvn))) + + docker run \ + --platform linux/amd64 \ + --volume "$PWD:/data" \ + --volume "$JAVA_HOME:/opt/java" \ + --volume "$MAVEN_HOME:/opt/maven" \ + linux-buildimage:complete \ + ./mvnw -B -V -ntp -P "release" "-Dmaven.test.skip=true" package - name: Upload build uses: actions/upload-artifact@v4 diff --git a/docker/Dockerfile b/docker/build/Dockerfile similarity index 100% rename from docker/Dockerfile rename to docker/build/Dockerfile diff --git a/docker/completebuild/Dockerfile b/docker/completebuild/Dockerfile new file mode 100644 index 00000000..a64edb92 --- /dev/null +++ b/docker/completebuild/Dockerfile @@ -0,0 +1,17 @@ +ARG UBUNTU_VERSION +FROM ubuntu:${UBUNTU_VERSION} +USER root + +VOLUME "/opt/java" +ENV JAVA_HOME="/opt/java" +ENV PATH="$JAVA_HOME:$PATH" + +VOLUME "/opt/maven" +ENV MAVEN_HOME="/opt/maven" +ENV PATH="$MAVEN_HOME:$PATH" + +VOLUME "/data" +WORKDIR "/data" + +ENTRYPOINT [ ] +CMD [ "/bin/bash" ] \ No newline at end of file