Merge branch 'main' into dependabot/cargo/aws-nitro-enclaves-cose-0.5.0

fdo-rs · Oct 20, 2022 · a116bc1 · a116bc1
2 parents 62651a2 + 93dfc80
commit a116bc1
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 6 deletions.
diff --git a/.github/actions/build_containers/action.yml b/.github/actions/build_containers/action.yml
@@ -46,14 +46,14 @@ runs:
       allimages=""
       alltags=""
       allimagetags=""
-      for container in admin-cli manufacturing-server rendezvous-server serviceinfo-api-server owner-onboarding-server
+      for container in admin-cli manufacturing-server rendezvous-server serviceinfo-api-server owner-onboarding-server aio
       do
         allimages="$allimages $container"
       done
       for tag in "$rawtags"
       do
         alltags="$alltags ${tag//imagename:/}"
-        for container in admin-cli manufacturing-server rendezvous-server serviceinfo-api-server owner-onboarding-server
+        for container in admin-cli manufacturing-server rendezvous-server serviceinfo-api-server owner-onboarding-server aio
         do
           allimagetags="$allimagetags ${tag//imagename/"$container"}"
         done
@@ -90,6 +90,17 @@ runs:
       build-args: |
         BUILDID=${{ steps.buildid.outputs.buildid }}
 
+  - name: Create aio container
+    uses: redhat-actions/buildah-build@v2
+    with:
+      containerfiles: contrib/containers/aio
+      tags: |
+        ${{ format(steps.container-metadata.outputs.tags, 'aio') }}
+        aio:${{ steps.buildid.outputs.buildid }}
+      labels: ${{ steps.container-metadata.outputs.labels }}
+      build-args: |
+        BUILDID=${{ steps.buildid.outputs.buildid }}
+
   - name: Create rendezvous-server container
     uses: redhat-actions/buildah-build@v2
     with:
@@ -126,7 +137,7 @@ runs:
   - name: Test containers
     shell: bash
     run: |
-      for container in admin-cli manufacturing-server rendezvous-server serviceinfo-api-server owner-onboarding-server
+      for container in admin-cli manufacturing-server rendezvous-server serviceinfo-api-server owner-onboarding-server aio
       do
         podman run --rm $container:${{ steps.buildid.outputs.buildid }} --version
       done
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -68,3 +68,12 @@ jobs:
         tags: ${{ steps.build.outputs.tags }}
         username: ${{ secrets.QUAY_USERNAME }}
         password: ${{ secrets.QUAY_ROBOT_TOKEN }}
+
+    - name: Push aio to quay.io
+      uses: redhat-actions/push-to-registry@v2
+      with:
+        registry: "quay.io/${{ env.quay_org }}"
+        image: aio
+        tags: ${{ steps.build.outputs.tags }}
+        username: ${{ secrets.QUAY_USERNAME }}
+        password: ${{ secrets.QUAY_ROBOT_TOKEN }}
diff --git a/admin-tool/Cargo.toml b/admin-tool/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 anyhow = "1"
 openssl = "0.10.35"
 log = "0.4"
-chrono = "0.4"
+time = "0.3.15"
 clap = { version = "3.1", features = ["derive"] }
 config = "0.11"
 futures = "0.3"

diff --git a/admin-tool/src/aio/execute.rs b/admin-tool/src/aio/execute.rs
@@ -7,6 +7,7 @@ use tokio::{
 };
 
 use super::{configure::Configuration, ChildBinary};
+use time::OffsetDateTime;
 
 const ALL_DAEMON_BINARIES: &[ChildBinary] = &[
     ChildBinary::ManufacturingServer,
@@ -19,7 +20,7 @@ const WAIT_BETWEEN_READY_TESTS: Duration = Duration::from_millis(500);
 
 #[derive(Debug)]
 struct RunningAioContext {
-    starttime: chrono::DateTime<chrono::offset::Utc>,
+    starttime: time::OffsetDateTime,
 
     configuration: Configuration,
 
@@ -37,7 +38,7 @@ impl RunningAioContext {
             binary_path,
             configuration,
             childs: Vec::new(),
-            starttime: chrono::offset::Utc::now(),
+            starttime: OffsetDateTime::now_utc(),
         })
     }
 

diff --git a/contrib/containers/aio b/contrib/containers/aio
@@ -0,0 +1,11 @@
+FROM quay.io/centos/centos:stream9
+ARG BUILDID
+COPY --from=fdo-build:${BUILDID} /usr/src/target/release/fdo-admin-tool /usr/bin
+COPY --from=fdo-build:${BUILDID} /usr/src/target/release/fdo-manufacturing-server /usr/bin
+COPY --from=fdo-build:${BUILDID} /usr/src/target/release/fdo-owner-onboarding-server /usr/bin
+COPY --from=fdo-build:${BUILDID} /usr/src/target/release/fdo-rendezvous-server /usr/bin
+COPY --from=fdo-build:${BUILDID} /usr/src/target/release/fdo-serviceinfo-api-server /usr/bin
+COPY --from=fdo-build:${BUILDID} /usr/src/target/release/fdo-client-linuxapp /usr/bin
+COPY --from=fdo-build:${BUILDID} /usr/src/target/release/fdo-owner-tool /usr/bin
+COPY --from=fdo-build:${BUILDID} /usr/src/target/release/fdo-manufacturing-client /usr/bin
+ENTRYPOINT ["fdo-admin-tool"]