diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f8b5a139..7c2c550db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,7 +62,7 @@ jobs: ./get_helm.sh - name: Build aiSSEMBLE # run: mvn dependency:resolve --file pom.xml -Dhabushu.usePyenv=false - run: mvn -B install --file pom.xml -pl :aissemble-enforcer-extension,:aissemble-airflow -Dhabushu.usePyenv=false -DskipTests -X + run: mvn -B install --file pom.xml -pl :aissemble-enforcer-extension,:aissemble-airflow,:aissemble-spark,:aissemble-jenkins-controller -Dhabushu.usePyenv=false -DskipTests -X # # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive # - name: Update dependency graph diff --git a/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-controller/src/main/resources/docker/Dockerfile b/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-controller/src/main/resources/docker/Dockerfile index d51112211..90b8a3d37 100644 --- a/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-controller/src/main/resources/docker/Dockerfile +++ b/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-controller/src/main/resources/docker/Dockerfile @@ -3,12 +3,12 @@ FROM jenkins/jenkins:lts-jdk11 LABEL org.opencontainers.image.source = "https://github.com/boozallen/aissemble" USER root -COPY ./target/cacerts/* /usr/local/share/ca-certificates/ +# COPY ./target/cacerts/* /usr/local/share/ca-certificates/ # Update CA certificates and import each certificate in the directory -RUN update-ca-certificates && \ - for cert in /usr/local/share/ca-certificates/*.crt; do \ - keytool -import -trustcacerts -keystore "$JAVA_HOME/lib/security/cacerts" -storepass changeit -noprompt -file "$cert"; \ - done +# RUN update-ca-certificates && \ +# for cert in /usr/local/share/ca-certificates/*.crt; do \ +# keytool -import -trustcacerts -keystore "$JAVA_HOME/lib/security/cacerts" -storepass changeit -noprompt -file "$cert"; \ +# done USER jenkins RUN jenkins-plugin-cli --plugins git:4.11.2 diff --git a/extensions/extensions-docker/aissemble-nvidia/src/main/resources/docker/Dockerfile b/extensions/extensions-docker/aissemble-nvidia/src/main/resources/docker/Dockerfile index df92b87cb..bb34a94cd 100644 --- a/extensions/extensions-docker/aissemble-nvidia/src/main/resources/docker/Dockerfile +++ b/extensions/extensions-docker/aissemble-nvidia/src/main/resources/docker/Dockerfile @@ -9,11 +9,11 @@ RUN printf '#!/bin/bash\n\nif [[ "$1" == "-r" ]] ;then\n echo '4.9.250'\n exit\n RUN chmod 755 /bin/uname # Workaround for ubuntu fix end -COPY ./target/cacerts/* /usr/local/share/ca-certificates/ +# COPY ./target/cacerts/* /usr/local/share/ca-certificates/ -RUN update-ca-certificates && apt-get update \ - && apt-get upgrade -y \ - && apt-get install -y openjdk-11-jdk \ - && update-ca-certificates \ - && rm -rf /var/lib/apt/lists/* \ - && apt-get clean \ No newline at end of file +# RUN update-ca-certificates && apt-get update \ +# && apt-get upgrade -y \ +# && apt-get install -y openjdk-11-jdk \ +# && update-ca-certificates \ +# && rm -rf /var/lib/apt/lists/* \ +# && apt-get clean \ No newline at end of file diff --git a/extensions/extensions-docker/aissemble-spark/src/main/resources/docker/Dockerfile b/extensions/extensions-docker/aissemble-spark/src/main/resources/docker/Dockerfile index 63021da95..35b7ebdbc 100644 --- a/extensions/extensions-docker/aissemble-spark/src/main/resources/docker/Dockerfile +++ b/extensions/extensions-docker/aissemble-spark/src/main/resources/docker/Dockerfile @@ -7,7 +7,7 @@ LABEL org.opencontainers.image.source = "https://github.com/boozallen/aissemble" USER root -COPY ./target/cacerts/* /usr/local/share/ca-certificates/ +# COPY ./target/cacerts/* /usr/local/share/ca-certificates/ # Configures the desired version of Python to install ARG PYTHON_VERSION=3.11.4