Browse Source

Fix error in Docker build + Docker container includes copy of 'fm-cdf-demo' branch of DTDesign project.

Joeri Exelmans 2 years ago
parent
commit
889d5d828b
2 changed files with 8 additions and 6 deletions
  1. 3 3
      flake.lock
  2. 5 3
      flake.nix

+ 3 - 3
flake.lock

@@ -102,11 +102,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1690272529,
-        "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
+        "lastModified": 1690367991,
+        "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
+        "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703",
         "type": "github"
       },
       "original": {

+ 5 - 3
flake.nix

@@ -154,8 +154,9 @@
             let
               dtdesignRepo = builtins.fetchGit {
                 url = "git@msdl.uantwerpen.be:lucasalbertins/DTDesign.git";
-                rev = "795cb854077d82fa6370ad64b8b6f06530e11bbc";
-                ref = "main";
+                # Which version of DTDesign repo to include...
+                rev = "3b3476e75345838755103dc84798102bda3526fb";
+                ref = "fm-cdf-demo";
                 shallow = true;
               };
             in pkgs.dockerTools.buildImage {
@@ -167,11 +168,12 @@
               '';
               config = {
                 Env = [ "PROJECTDIR=/projectdir" ]; # tell the script where the projectdir is at.
-                Cmd = [ "${serviceMonitor}" ]; # ran when container starts
+                Cmd = [ "${serviceMonitor}/bin/serviceMonitor" ]; # ran when container starts
                 ExposedPorts = {
                   "5000/tcp" = {}; # python backend
                   "3030/tcp" = {}; # fuseki
                   "8700/tcp" = {}; # lightttp (serving drawio)
+                  "8081/tcp" = {}; # wee
                 };
                 Volumes = {
                   "/projectdir" = {}; # path to persist as Docker 'Volume'