Use daml.exe instead of da.exe (#1)

Author: gaborh-da

.circleci/config.yml

@@ -75,7 +75,7 @@ jobs:
           command: |
             export PATH=${HOME}/.daml/bin:${PATH}
             daml build -o target/supplychain.dar
-            daml test --junit target/daml-test-reports/daml-test.xml src/main/daml/DA/RefApps/SupplyChain/Scenarios.daml
+            daml test --junit target/daml-test-reports/daml-test.xml --files src/main/daml/DA/RefApps/SupplyChain/Scenarios.daml
       - save_cache:
           paths:
             - ~/.daml

Dockerfile-navigator

@@ -1,16 +1,19 @@
+#
+# Copyright (c) 2019, Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
 FROM ubuntu:18.04
 
+ARG sdk_version=0.13.10
+
 WORKDIR /home/sdk
 
 COPY ui-backend.conf frontend-config.js /home/sdk/
+COPY scripts/install-daml.sh /home/sdk/
 
-RUN /bin/bash -c "apt-get update --no-show-upgraded &&  apt-get install curl openjdk-8-jdk -y"
-RUN /bin/bash -c "curl -L https://github.com/digital-asset/daml/releases/download/v0.12.21/daml-sdk-0.12.21-linux.tar.gz -o daml-sdk-0.12.21-linux.tar.gz && \
-                  tar -zxvf daml-sdk-0.12.21-linux.tar.gz && \
-                  cd sdk-0.12.21 && \
-                  ./install.sh && \
-                  cd - && \
-                  rm -rf sdk-0.12.21"
+RUN /bin/bash -c "apt-get update --no-show-upgraded &&  apt-get install wget openjdk-8-jdk -y"
+RUN /home/sdk/install-daml.sh ${sdk_version}
 
 EXPOSE 7500
 

Dockerfile-sandbox

@@ -1,16 +1,19 @@
+#
+# Copyright (c) 2019, Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
 FROM ubuntu:18.04
 
+ARG sdk_version=0.13.10
+
 WORKDIR /home/sdk
 
 COPY target/supplychain.dar /home/sdk/
+COPY scripts/install-daml.sh /home/sdk/
 
-RUN /bin/bash -c "apt-get update --no-show-upgraded &&  apt-get install curl openjdk-8-jdk -y"
-RUN /bin/bash -c "curl -L https://github.com/digital-asset/daml/releases/download/v0.12.21/daml-sdk-0.12.21-linux.tar.gz -o daml-sdk-0.12.21-linux.tar.gz && \
-                  tar -zxvf daml-sdk-0.12.21-linux.tar.gz && \
-                  cd sdk-0.12.21 && \
-                  ./install.sh && \
-                  cd - && \
-                  rm -rf sdk-0.12.21"
+RUN /bin/bash -c "apt-get update --no-show-upgraded &&  apt-get install wget openjdk-8-jdk -y"
+RUN /home/sdk/install-daml.sh ${sdk_version}
 
 EXPOSE 7600
 

README.md

@@ -31,15 +31,12 @@ _**Note:** If you change the DAML models locally, you need to run re-run this co
 ### Starting the App
 
 Running on local machine requires three terminal tabs:
-1. Run Sandbox:
+1. Run Sandbox and Navigator:
 ```bash
-daml sandbox -- --port 7600 --scenario DA.RefApps.SupplyChain.Scenarios:setup target/supplychain.dar
+daml start
 ```
-2. Run Navigator Backend:
-```bash
-daml navigator -- server localhost 7600 --port 7500 --config-file ui-backend.conf
-```
-3. Run bots:
+
+2. Run bots:
 ```bash
 java -jar target/supplychain-0.0.1-SNAPSHOT.jar -p 7600
 ```

da.yaml

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-sdk-version: 0.12.21
+sdk-version: 0.13.10
 name: supplychain
 source: src/main/daml/DA/RefApps/SupplyChain/Scenarios.daml
 scenario: DA.RefApps.SupplyChain.Scenarios:setup

daml.yaml

@@ -0,0 +1,27 @@
+
+#!/usr/bin/env bash
+#
+# Copyright (c) 2019, Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+
+if [ $# -eq 0 ]
+then
+    echo "ERROR: No parameters given! Usage: ${0} SDK_VERSION"
+    exit 1
+fi
+
+SDK_VERSION="${1}"
+
+if [ -f "${HOME}/.daml/bin/daml" ]
+then
+    echo "Skipping DAML SDK installation as it is already installed..."
+else
+    cd ${HOME}
+    wget https://github.com/digital-asset/daml/releases/download/v${SDK_VERSION}/daml-sdk-${SDK_VERSION}-linux.tar.gz
+    tar -zxvf daml-sdk-${SDK_VERSION}-linux.tar.gz
+    cd sdk-${SDK_VERSION}
+    ./install.sh
+    cd ${HOME}
+    rm -rf sdk-${SDK_VERSION}
+fi

scripts/install-daml.sh

@@ -23,17 +23,18 @@ echo "SDK version is $SDK_VERSION"
 echo "modifying ${PROJECT_DIR}/da.yaml"
 sed -e "s/sdk-version: .*$/sdk-version: $SDK_VERSION/" -i "${PROJECT_DIR}/da.yaml"
 
+echo "SDK version is $SDK_VERSION"
 echo "modifying ${PROJECT_DIR}/daml.yaml"
 sed -e "s/sdk-version: .*$/sdk-version: $SDK_VERSION/" -i "${PROJECT_DIR}/daml.yaml"
 
-# echo "modifying ${PROJECT_DIR}/pom.xml"
-# sed -e "s/<daml-sdk.version>.*<\/daml-sdk.version>$/<daml-sdk.version>10$SDK_VERSION<\/daml-sdk.version>/" -i "${PROJECT_DIR}/pom.xml"
+echo "modifying ${PROJECT_DIR}/pom.xml"
+sed -e "s/<daml-sdk.version>.*<\/daml-sdk.version>$/<daml-sdk.version>10$SDK_VERSION<\/daml-sdk.version>/" -i "${PROJECT_DIR}/pom.xml"
 
-# echo "modifying ${PROJECT_DIR}/Dockerfile-navigator"
-# sed -e "s/FROM digitalasset\/daml-sdk:.*$/FROM digitalasset\/daml-sdk:$SDK_VERSION-master/" -i "${PROJECT_DIR}/Dockerfile-navigator"
+echo "modifying ${PROJECT_DIR}/Dockerfile-navigator"
+sed -e "s/ARG sdk_version=.*/ARG sdk_version=$SDK_VERSION/" -i "${PROJECT_DIR}/Dockerfile-navigator"
 
-# echo "modifying ${PROJECT_DIR}/Dockerfile-sandbox"
-# sed -e "s/FROM digitalasset\/daml-sdk:.*$/FROM digitalasset\/daml-sdk:$SDK_VERSION-master/" -i "${PROJECT_DIR}/Dockerfile-sandbox"
+echo "modifying ${PROJECT_DIR}/Dockerfile-sandbox"
+sed -e "s/ARG sdk_version=.*/ARG sdk_version=$SDK_VERSION/" -i "${PROJECT_DIR}/Dockerfile-sandbox"
 
 echo "modifying ${PROJECT_DIR}/.circleci/config.yml"
-sed -e "s/image: digitalasset\/daml-sdk:.*$/image: digitalasset\/daml-sdk:$SDK_VERSION-circleci-master/" -i "${PROJECT_DIR}/.circleci/config.yml"
+sed -e "s/_version: \".*\"$/_version: \"$SDK_VERSION\"/" -i "${PROJECT_DIR}/.circleci/config.yml"