Try to fix docker

cardano-foundation · Aug 17, 2020 · 783f6f1 · 783f6f1
1 parent 0731cea
commit 783f6f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/RELEASE_TEMPLATE.md b/.github/RELEASE_TEMPLATE.md
@@ -45,8 +45,8 @@ the moment of releasing. -->
 Pull from DockerHub and verify the version matches {{CABAL_VERSION}}.
 
 ```
-$ docker pull inputoutput/cardano-wallet:{{CABAL_VERSION}}-shelley
-$ docker run --rm inputoutput/cardano-wallet:{{CABAL_VERSION}}-shelley version
+$ docker pull inputoutput/cardano-wallet:{{CABAL_VERSION}}
+$ docker run --rm inputoutput/cardano-wallet:{{CABAL_VERSION}} version
 ```
 
 ### ITN (jormungandr)

diff --git a/nix/docker.nix b/nix/docker.nix
@@ -27,7 +27,9 @@ let
   defaultPort = "8090";
   dataDir = "/data";
 
-  startScript = writeScriptBin "start-cardano-wallet-${backend}" ''
+  suffix = if backend == "shelley" then "" else "-" + backend;
+  walletExeName = "cardano-wallet" + suffix;
+  startScript = writeScriptBin "start-wallet" ''
     #!${runtimeShell}
     set -euo pipefail
 
@@ -37,7 +39,7 @@ let
     ln -s ${dataDir} /cardano-wallet
 
     export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
-    exec ${exe}/bin/cardano-wallet-${backend} "$@"
+    exec ${exe}/bin/${walletExeName} "$@"
   '';
 
   # Config file needed for container/host resolution.
@@ -68,7 +70,7 @@ in
       startScript
     ];
     config = {
-      EntryPoint = [ "start-cardano-wallet-${backend}" ];
+      EntryPoint = [ "start-wallet" ];
       ExposedPorts = {
         "${defaultPort}/tcp" = {}; # wallet api
       };