Merge pull request #769 from input-output-hk/ch1bo/fix-hydraw

Fix Hydraw docker image
cardano-scaling · Mar 10, 2023 · 31c4cf6 · 31c4cf6
2 parents 9bed804 + 9304700
commit 31c4cf6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -68,8 +68,9 @@ jobs:
           --label org.opencontainers.image.version=${VERSION_NAME:-unstable} \
           --tag ${IMAGE_NAME}:unstable -
         # Also tag with semver and 'latest' if we are building a tag
-        [[ ${BUILDING_TAG} = true ]] && \
-          docker tag ${IMAGE_NAME}:unstable ${IMAGE_NAME}:${{github.ref_name}} \
+        [[ ${BUILDING_TAG} = true && ${{matrix.target}} != "hydraw" ]] && \
+          docker tag ${IMAGE_NAME}:unstable ${IMAGE_NAME}:${{github.ref_name}}
+        [[ ${BUILDING_TAG} = true] ]] && \
           docker tag ${IMAGE_NAME}:unstable ${IMAGE_NAME}:latest
         docker images
         docker inspect ${IMAGE_NAME}:unstable

diff --git a/hydraw/bundle.js → hydraw/static/bundle.js b/hydraw/bundle.js → hydraw/static/bundle.js
diff --git a/hydraw/hydraw.gif → hydraw/static/hydraw.gif b/hydraw/hydraw.gif → hydraw/static/hydraw.gif
diff --git a/hydraw/index.html → hydraw/static/index.html b/hydraw/index.html → hydraw/static/index.html
diff --git a/hydraw/logo.png → hydraw/static/logo.png b/hydraw/logo.png → hydraw/static/logo.png
diff --git a/hydraw/style.css → hydraw/static/style.css b/hydraw/style.css → hydraw/static/style.css
diff --git a/nix/hydra/docker.nix b/nix/hydra/docker.nix
@@ -42,6 +42,13 @@ in
     created = "now";
     config = {
       Entrypoint = [ "${hydraPackages.hydraw-static}/bin/hydraw" ];
+      WorkingDir = "/static";
     };
+    copyToRoot = [
+      (pkgs.runCommand "hydraw-static-files" { } ''
+        mkdir $out
+        ln -s ${../../hydraw/static} $out/static
+      '')
+    ];
   };
 }