Docker base updates (#6942)

jaymcnallie · brendan-hofmann · web-flow · commit 394fa4182fa3 · 2025-12-24T10:29:25.000-07:00
* updated to use docker base 3.0 * fixed solrcloud netwokring and javax activation issue * moved javax.activation.version variable up to root pom * merged 2.29.x onto master; updated version to 2.30.0-SNAPSHOT; Use Java 17 for CI builds * Revert "merged 2.29.x onto master; updated version to 2.30.0-SNAPSHOT; Use Java 17 for CI builds" This reverts commit 0ab2455. * Added Github Actions workflow file * upgrade jsr-339 to jakarta * revert solr download * free up disk space before runners build * remove PR comment notifications --------- Co-authored-by: Brendan Hofmann <brendan.hofmann@octoconsulting.com>
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,38 +17,24 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-permissions:
-  contents: read
-  pull-requests: write
-  issues: write
-
 env:
   MAVEN_OPTS: '-Xmx4G -Xms1G -XX:+ClassUnloadingWithConcurrentMark -Djava.security.egd=file:/dev/./urandom'
   MAVEN_CLI_OPTS: '-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
 
 jobs:
-  # Notify build started (for PRs)
-  notify-start:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Post PR comment
-        uses: actions/github-script@v7
-        with:
-          script: |
-            github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              body: `🚀 Build started! [View workflow run](${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})`
-            })
-
   # Incremental build for PRs
   incremental-build:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     timeout-minutes: 180
     steps:
+      - name: Free disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          df -h
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
@@ -77,6 +63,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 180
     steps:
+      - name: Free disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          df -h
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -104,6 +97,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
+      - name: Free disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /opt/ghc
+          df -h
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -252,45 +252,23 @@ jobs:
             -DskipTests=true \
             -DretryFailedDeploymentCount=10
 
-  # Final status notification
-  notify-result:
-    needs: [incremental-build, full-build, integration-tests, dependency-check]
-    if: always()
+  # Slack notification (non-PR builds only)
+  notify-slack:
+    needs: [full-build, dependency-check]
+    if: always() && github.event_name != 'pull_request'
     runs-on: ubuntu-latest
     steps:
       - name: Determine build result
         id: result
         run: |
-          # Check for failures (skipped jobs are OK)
-          FAILED=false
-          if [[ "${{ needs.incremental-build.result }}" == "failure" ]]; then FAILED=true; fi
-          if [[ "${{ needs.full-build.result }}" == "failure" ]]; then FAILED=true; fi
-          if [[ "${{ needs.integration-tests.result }}" == "failure" ]]; then FAILED=true; fi
-          if [[ "${{ needs.dependency-check.result }}" == "failure" ]]; then FAILED=true; fi
-
-          if [[ "$FAILED" == "true" ]]; then
+          if [[ "${{ needs.full-build.result }}" == "failure" ]] || \
+             [[ "${{ needs.dependency-check.result }}" == "failure" ]]; then
             echo "status=failure" >> $GITHUB_OUTPUT
           else
             echo "status=success" >> $GITHUB_OUTPUT
           fi
 
-      - name: Post PR comment with result
-        if: github.event_name == 'pull_request'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const status = '${{ steps.result.outputs.status }}';
-            const emoji = status === 'success' ? '✅' : '❌';
-            const message = status === 'success' ? 'Build succeeded!' : 'Build failed.';
-            github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              body: `${emoji} ${message} [View workflow run](${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId})`
-            })
-
       - name: Slack notification
-        if: github.event_name != 'pull_request'
         uses: slackapi/slack-github-action@v1.26.0
         with:
           payload: |
diff --git a/catalog/rest/catalog-rest-endpoint/pom.xml b/catalog/rest/catalog-rest-endpoint/pom.xml
@@ -196,11 +196,6 @@
             <artifactId>catalog-rest-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>${jakarta.activation.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.jaxb-api-2.2</artifactId>
diff --git a/distribution/docker/ddf-docker/pom.xml b/distribution/docker/ddf-docker/pom.xml
@@ -26,7 +26,7 @@
 
     <properties>
         <!-- Set the version of the codice/ddf-base docker image to build on top of here -->
-        <docker.ddf.base.version>2.29-alpine</docker.ddf.base.version>
+        <docker.ddf.base.version>3.0</docker.ddf.base.version>
     </properties>
 
     <dependencies>
@@ -74,6 +74,22 @@
                                             <descriptor>files.xml</descriptor>
                                         </assembly>
                                     </build>
+                                    <run>
+                                        <hostname>localhost</hostname>
+                                        <network>
+                                            <mode>custom</mode>
+                                            <name>solrcloud_solrcloud</name>
+                                        </network>
+                                        <ports>
+                                            <port>8993:8993</port>
+                                            <port>8181:8181</port>
+                                            <port>8101:8101</port>
+                                        </ports>
+                                        <env>
+                                            <SOLR_URL>http://solr1:8994/solr</SOLR_URL>
+                                            <SOLR_ZK_HOSTS>zoo:2181</SOLR_ZK_HOSTS>
+                                        </env>
+                                    </run>
                                 </image>
                             </images>
                         </configuration>
diff --git a/distribution/docker/ddf-docker/src/main/docker/Dockerfile b/distribution/docker/ddf-docker/src/main/docker/Dockerfile
@@ -18,6 +18,7 @@ LABEL maintainer=codice
 ENV APP_HOME=/app
 ENV APP_NAME=/ddf
 ENV APP_LOG=$APP_HOME/data/log/$APP_NAME.log
+ENV INSTALL_FEATURES=profile-standard
 
 COPY --from=prep /prep/ddf $APP_HOME
 
diff --git a/distribution/docker/solrcloud/src/main/resources-filtered/solrcloud/docker-compose.yml b/distribution/docker/solrcloud/src/main/resources-filtered/solrcloud/docker-compose.yml
@@ -24,15 +24,14 @@ services:
   solr1:
     image: codice/ddf-solr:${project.version}
     container_name: solr1
-    hostname: localhost
+    hostname: solr1
     restart: always
     entrypoint: docker-entrypoint.sh
     command: solr-fg
     ports:
       - "8994:8994"
-      - "8995:8995"
     environment:
-      - SOLR_HOST=localhost
+      - SOLR_HOST=solr1
       - SOLR_PORT=8994
       - SOLR_OPTS=-Djute.maxbuffer=2097152
       - ZK_HOST=zoo:2181
@@ -46,17 +45,21 @@ services:
   solr2:
     image: codice/ddf-solr:${project.version}
     container_name: solr2
+    hostname: solr2
     restart: always
     entrypoint: docker-entrypoint.sh
     command: solr-fg
+    ports:
+      - "8995:8995"
     environment:
-      - SOLR_HOST=localhost
+      - SOLR_HOST=solr2
       - SOLR_PORT=8995
       - SOLR_OPTS=-Djute.maxbuffer=2097152
       - ZK_HOST=zoo:2181
     volumes:
       - solr2_data:/var/solr
-    network_mode: "service:solr1"
+    networks:
+      - solrcloud
     depends_on:
       - zoo
       - solr1
diff --git a/distribution/kernel/pom.xml b/distribution/kernel/pom.xml
@@ -227,10 +227,11 @@
                                     <outputDirectory>${setup.folder}/jdk9plus</outputDirectory>
                                 </artifactItem>
                                 <!-- Can't use servicemix bundle because of https://issues.apache.org/jira/browse/SM-4352 -->
+                                <!-- Using javax.activation instead of jakarta.activation for CXF 3.6.x compatibility -->
                                 <artifactItem>
-                                    <groupId>jakarta.activation</groupId>
-                                    <artifactId>jakarta.activation-api</artifactId>
-                                    <version>${jakarta.activation.version}</version>
+                                    <groupId>com.sun.activation</groupId>
+                                    <artifactId>javax.activation</artifactId>
+                                    <version>${javax.activation.version}</version>
                                     <outputDirectory>${setup.folder}/jdk9plus</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
diff --git a/features/admin/src/main/feature/feature.xml b/features/admin/src/main/feature/feature.xml
@@ -56,8 +56,6 @@
 
     <feature name="platform-configuration" version="${project.version}"
              description="Shared platform configuration">
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/2.6.0
-        </bundle>
         <feature>camel-blueprint</feature>
         <feature>camel-http</feature>
         <feature>cxf-jaxrs</feature>
diff --git a/features/solr/src/main/feature/feature.xml b/features/solr/src/main/feature/feature.xml
@@ -33,7 +33,6 @@
         <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${solr.httpcore.version}</bundle>
         <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${solr.httpclient.version}</bundle>
         <bundle>mvn:com.sun.mail/jakarta.mail/${jakarta.mail.version}</bundle>
-        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/2.6.0</bundle>
         <bundle>mvn:ddf.platform.solr/solr-dependencies/${project.version}</bundle>
     </feature>
 
diff --git a/platform/landing-page/pom.xml b/platform/landing-page/pom.xml
@@ -46,9 +46,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
-            <version>${jsr339-api.bundle.version}</version>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
diff --git a/platform/mime/core/platform-mime-core-impl/pom.xml b/platform/mime/core/platform-mime-core-impl/pom.xml
@@ -64,10 +64,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.specs</groupId>
-            <artifactId>org.apache.servicemix.specs.jsr339-api-2.0</artifactId>
-            <version>${jsr339-api.bundle.version}</version>
-            <scope>test</scope>
+            <groupId>jakarta.ws.rs</groupId>
+	    <artifactId>jakarta.ws.rs-api</artifactId>
+	    <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ddf.mime.tika</groupId>
diff --git a/pom.xml b/pom.xml
@@ -208,6 +208,7 @@
         <jakarta.activation.version>1.2.2</jakarta.activation.version>
         <jakarta.mail.version>1.6.7</jakarta.mail.version>
         <jasypt.version>1.9.3</jasypt.version>
+	<javax.activation.version>1.2.0</javax.activation.version>
         <javax.annotation-api.version>1.3.5</javax.annotation-api.version>
         <javax.cache.version>1.1.1</javax.cache.version>
         <javax.cache.bundle.version>1.1.1_1</javax.cache.bundle.version>
@@ -237,7 +238,6 @@
         <jsoup.version>1.18.3</jsoup.version>
         <jsr305.version>3.0.2</jsr305.version>
         <jsr305.bundle.version>${jsr305.version}_1</jsr305.bundle.version>
-        <jsr339-api.bundle.version>2.6.0</jsr339-api.bundle.version>
         <jts.version>1.20.0</jts.version>
         <jts.spatial4j.version>1.17.1</jts.spatial4j.version>
         <jvnet-ogc.version>2.6.1</jvnet-ogc.version>
@@ -345,7 +345,7 @@
         <org.json.version>20240303</org.json.version>
 
         <!--temporary solr download url> -->
-        <solr.download.url>https://dlcdn.apache.org</solr.download.url>
+        <solr.download.url>https://archive.apache.org/dist</solr.download.url>
 
         <!-- SonarQube Properties -->
         <sonar.coverage.jacoco.xmlReportPaths>${project.build.directory}/site/${project.report.output.directory}/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
