WIP

input-output-hk · Aug 22, 2023 · 7c3904f · 7c3904f
1 parent eb8d9f8
commit 7c3904f
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 27 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -12,9 +12,6 @@ on:
 jobs:
   publish:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        image: [marlowe-playground-server, marlowe-playground-client]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -32,23 +29,33 @@ jobs:
 
       - name: Build image and copy to local Docker registry
         run: |
-          nix develop --command std //marlowe-playground/oci-images/${{ matrix.image }}:load
+          nix build .#oci-images.x86_64-linux.all.copyToDockerDaemon
+          ./result/bin/copy-to-docker-daemon
 
       - name: Authenticate with container registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
       - name: Tag and push images
         run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/${{ matrix.image }}
-          # Change all uppercase to lowercase
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          # Strip git ref prefix from version
-          TAG=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          # Use Docker `latest` tag convention
-          [ "$TAG" == "main" ] && TAG=latest
-          # Use date + short hash for production releases
-          [ "$TAG" == "production" ] && TAG="$(date +'%Y-%m-%d')-$(git rev-parse --short "${{ github.ref }}")"
-          echo IMAGE_ID=$IMAGE_ID
-          echo TAG=$TAG
-          docker tag ${{ matrix.image }} $IMAGE_ID:$TAG
-          docker push $IMAGE_ID:$TAG
+          tagAndPush() {
+            IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$1
+            # Change all uppercase to lowercase
+            IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+            # Strip git ref prefix from version
+            TAG=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+            # Strip "runtime@v" prefix from tag name
+            [[ "${{ github.ref }}" == "refs/tags/"* ]] && TAG=$(echo $TAG | sed -e 's/^runtime@v//')
+
+            # Use Docker `latest` tag convention
+            [ "$TAG" == "main" ] && TAG=latest
+
+            # Use date + short hash for production releases
+            [ "$TAG" == "production" ] && TAG="$(date +'%Y-%m-%d')-$(git rev-parse --short "${{ github.ref }}")"
+
+            echo IMAGE_ID=$IMAGE_ID
+            echo TAG=$TAG
+            docker tag $1:latest $IMAGE_ID:$TAG
+            docker push $IMAGE_ID:$TAG
+          }
+          tagAndPush "marlowe-playground-server"
+          tagAndPush "marlowe-playground-client"
diff --git a/nix/marlowe-playground/oci-images.nix b/nix/marlowe-playground/oci-images.nix
@@ -16,14 +16,27 @@ let
       };
     };
 
-in
-lib.optionalAttrs pkgs.stdenv.isLinux {
-  marlowe-playground-server = mkImage {
-    name = "marlowe-playground-server";
-    description = "The backend of the Marlowe playground.";
+  images = {
+    marlowe-playground-server = mkImage {
+      name = "marlowe-playground-server";
+      description = "The backend of the Marlowe playground.";
+    };
+    marlowe-playground-client = mkImage {
+      name = "marlowe-playground-client";
+      description = "An HTTP server that serves the client for the Marlowe Playground.";
+    };
   };
-  marlowe-playground-client = mkImage {
-    name = "marlowe-playground-client";
-    description = "An HTTP server that serves the client for the Marlowe Playground.";
+
+  forAllImages = f: concatMapStrings (s: s + "\n") (mapAttrsToList f images);
+
+in
+images // {
+  all = {
+    copyToDockerDaemon = std.lib.ops.writeScript {
+      name = "copy-to-docker-daemon";
+      text = forAllImages (name: img:
+        "${n2c.packages.skopeo-nix2container}/bin/skopeo --insecure-policy copy nix:${img} docker-daemon:${name}:latest"
+      );
+    };
   };
 }
diff --git a/nix/marlowe-playground/operables.nix b/nix/marlowe-playground/operables.nix
@@ -1,6 +1,6 @@
 { inputs', pkgs, ... }:
 
-project: 
+project:
 
 let
 
@@ -12,7 +12,7 @@ let
 in
 {
   marlowe-playground-client = mkOperable {
-    package = marlowe-playground-client;
+    package = inputs'.self.packages.marlowe-playground-client;
     runtimeInputs = [ darkhttpd ];
     runtimeScript = ''
       exec darkhttpd "''${CONFIG_HTML_ROOT:-${inputs'.self.packages.marlowe-playground-client}}" --port 8080 --mimetypes ${mailcap}/etc/mime.types