WIP

Author: jbern0rd

.github/workflows/ci.yaml

@@ -0,0 +1,90 @@
+name: Rust CI
+
+on:
+  pull_request:
+  push:
+  workflow_dispatch:
+
+jobs:
+  prepare:
+    name: Determine image tag
+    #runs-on: ubuntu-latest
+    runs-on:
+      group: Azure_runners
+    #if: |
+    #  github.ref_name == 'main' ||
+    #  startsWith(github.head_ref, 'feature/') ||
+    #  startsWith(github.head_ref, 'bugfix/') ||
+    #  (github.event_name == 'workflow_dispatch' && (startsWith(github.ref_name, 'feature/') || startsWith(github.ref_name, 'bugfix/')))
+    outputs:
+      image_tag: ${{ steps.determine-tag.outputs.image_tag }}
+      jar_path: ${{ steps.jar-path.outputs.jar_path }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Determine base tag
+        id: determine-tag
+        run: |
+          if [ "${{ github.event_name }}" = "pull_request" ] ; then
+            SHORT_SHA=$(echo ${{ github.event.pull_request.head.sha }} | cut -c1-8)
+          else
+            SHORT_SHA=$(echo ${{ github.sha }} | cut -c1-8)
+          fi
+
+          if [ "${{ github.ref_name }}" = "main" ] ; then
+            echo "Processing main branch"
+            echo "image_tag=dev-${SHORT_SHA}" | tee -a $GITHUB_OUTPUT
+          else
+            # This covers feature/ and bugfix/ branches
+            echo "Processing feature/bugfix branch ${{ github.head_ref }}"
+            echo "image_tag=feature-${SHORT_SHA}" | tee -a $GITHUB_OUTPUT
+          fi
+
+      - name: Docker Regis login
+        uses: docker/login-action@v3
+        with:
+          registry: docker-regis.iex.ec
+          username: ${{ secrets.NEXUS_USERNAME }}
+          password: ${{ secrets.NEXUS_PASSWORD }}
+
+      - name: Build jar
+        id: jar-path
+        run: |
+          ./gradlew build
+          echo "jar_path=$(gradle properties | grep jarPathForOCI | cut -d" " -f2)" | tee -a $GITHUB_OUTPUT
+        env:
+          ORG_GRADLE_PROJECT_nexusUser: ${{ secrets.NEXUS_USERNAME }}
+          ORG_GRADLE_PROJECT_nexusPassword: ${{ secrets.NEXUS_PASSWORD }}
+
+  build-oci-image:
+    name: Build OCI images
+    needs: prepare
+    uses: iExecBlockchainComputing/github-actions-workflows/.github/workflows/docker-build.yml@feature/improve-docker-build
+    with:
+      image-name: docker-regis.iex.ec/iexec-blockchain-adpter-api
+      image-tag: ${{ needs.prepare.outputs.image_tag }}
+      dockerfile: Dockerfile
+      context: .
+      registry: docker-regis.iex.ec
+      push: false
+      security-scan: true
+      security-report: "sarif"
+      hadolint: true
+      platforms: linux/amd64
+      build-args: |
+        jar=${{ needs.prepare.outputs.jar_path }}
+    secrets:
+      username: ${{ secrets.NEXUS_USERNAME }}
+      password: ${{ secrets.NEXUS_PASSWORD }}

Jenkinsfile

@@ -2,4 +2,4 @@
 buildJavaProject(
         integrationTestsEnvVars: ['BROKER_PRIVATE_KEY'],
         shouldPublishJars: true,
-        shouldPublishDockerImages: true)
+        shouldPublishDockerImages: false)

build.gradle

@@ -94,6 +94,15 @@ testing {
             dependencies {
                 implementation "org.testcontainers:mongodb:$testContainersVersion"
             }
+            targets {
+                all {
+                    testTask.configure {
+                        systemProperty 'registryUsername', project.findProperty('nexusUser') ?: ''
+                        systemProperty 'registryPassword', project.findProperty('nexusPassword') ?: ''
+                        systemProperty 'registryAddress', 'docker-regis.iex.ec'
+                    }
+                }
+            }
         }
         itest(JvmTestSuite) {
             dependencies {
@@ -141,11 +150,10 @@ publishing {
 
 ext.jarPathForOCI = relativePath(tasks.bootJar.outputs.files.singleFile)
 ext.gitShortCommit = 'git rev-parse --short=8 HEAD'.execute().text.trim()
-ext.ociImageName = 'local/' + ['bash', '-c', 'basename $(git config --get remote.origin.url) .git'].execute().text.trim()
 
 tasks.register('buildImage', Exec) {
     group 'Build'
     description 'Builds an OCI image from a Dockerfile.'
     dependsOn bootJar
-    commandLine 'docker', 'build', '--build-arg', 'jar=' + jarPathForOCI, '-t', ociImageName + ':dev', '.'
+    commandLine 'docker', 'build', '--build-arg', 'jar=' + jarPathForOCI, '-t', 'local/' + rootProject.name + ':dev', '.'
 }

src/test/java/com/iexec/blockchain/chain/BlockchainListenerTests.java

@@ -16,14 +16,17 @@
 
 package com.iexec.blockchain.chain;
 
+import com.github.dockerjava.api.model.AuthConfig;
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
 import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
+import org.testcontainers.DockerClientFactory;
 import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.junit.jupiter.Container;
@@ -48,6 +51,21 @@ class BlockchainListenerTests {
     private static final String MONGO_SVC_NAME = "ibaa-blockchain-adapter-mongo";
     private static final int MONGO_SVC_PORT = 27017;
 
+    @BeforeAll
+    static void setupAuth() {
+        final AuthConfig authConfig = new AuthConfig()
+                .withUsername(System.getProperty("registryUsername"))
+                .withPassword(System.getProperty("registryPassword"))
+                .withRegistryAddress(System.getProperty("registryAddress"));
+
+        // Configure Docker client with auth
+        DockerClientFactory.instance()
+                .client()
+                .authCmd()
+                .withAuthConfig(authConfig)
+                .exec();
+    }
+
     @Container
     static ComposeContainer environment = new ComposeContainer(new File("docker-compose.yml"))
             .withExposedService(CHAIN_SVC_NAME, CHAIN_SVC_PORT, Wait.forListeningPort())