#74 - something is wrong with startup-script. Trying again.

apihub-root/index.html

@@ -429,6 +429,7 @@ <h3><a id="participant-name">Participant</a> Workspace</h3>
 
         <h2>v0.9.6? Release Notes 2022-MM-DD (Pending changes for the next release)</h2>
         <ul>
+            <li>Experimental dockerhub image.</li>
             <li>Shipment creation error messages on the DSU layer are reported back to the REST /shipment/create caller.</li>
         </ul>
 

docker/api/Dockerfile

@@ -1,5 +1,8 @@
+#
 # Docker image build for Finished Goods Traceability (FGT)
 #
+# docker build --build-arg GIT_BRANCH=v0.9.6 -t fgt:v0.9.6 --rm=false --pull --network host -f=Dockerfile .
+#
 FROM node:14.17.4-alpine
 
 # The tag, branch or commit hash to clone.
@@ -20,9 +23,6 @@ WORKDIR /fgt-workspace
 RUN git clone -b ${GIT_BRANCH} --single-branch --depth 1 https://github.com/PharmaLedger-IMI/fgt-workspace.git . && \
     npm install --unsafe-perm
 
-# copy bdns+domain configuration files from local context
-COPY config/ apihub-root/external-volume/config/
-
 # Remove all Git related files and directories - see https://gist.github.com/facelordgists/80e868ff5e315878ecd6
 RUN find . \( -name ".git" -o -name ".gitignore" -o -name ".gitmodules" -o -name ".gitattributes" \) -exec rm -rf -- {} +
 

docker/api/docker-compose.yml

@@ -10,7 +10,7 @@ x-participant-def:
     timeout: 3s
     retries: 100
     start_period: 40s
-  command: ["/bin/bash", "-c", "cd /fgt-workspace ; npm run server & ( sleep 5s ; npm run build-all ; cd fgt-api ; npm run boot-api )"]
+  command: ["/bin/sh", "-c", "/fgt-workspace/docker/api/startup-script.sh"]
   # the command above is not for the tracebility apihub, so it must be overridden on fgt-workspace.
 x-mah-def:
   &mah-def
@@ -123,7 +123,7 @@ services:
       timeout: 3s
       retries: 100
       start_period: 20s
-    command: ["/bin/sh", "-c", "/fgt-workspace/docker/api/startup-script-bc.sh"]
+    command: ["/bin/sh", "-c", "/fgt-workspace/docker/api/traceability/startup-script.sh"]
 
   mah-roche:
     << : *mah-def

docker/api/startup-script.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 # use /bin/sh to be compatible with Alpine / Busybox
+# This script expects cwd to be /fgt-workspace
 rm -rf apihub-root/external-volume/config
 cp -r docker/api/config apihub-root/external-volume/config
-cd /fgt-workspace ; npm run server & ( sleep 5s ; npm run build-all ; cd fgt-api ; npm run boot-api )
+npm run server & ( sleep 5s ; npm run build-all ; cd fgt-api ; npm run boot-api )

docker/api/traceability/Dockerfile

@@ -1,3 +1,4 @@
+#
 # Docker image build for Finished Goods Traceability (FGT)
 #
 FROM node:14.17.4-alpine
@@ -20,9 +21,6 @@ WORKDIR /fgt-workspace
 RUN git clone -b ${GIT_BRANCH} --single-branch --depth 1 https://github.com/PharmaLedger-IMI/fgt-workspace.git . && \
     npm install --unsafe-perm
 
-# copy bdns+domain configuration files from local context
-COPY config/ apihub-root/external-volume/config/
-
 # Remove all Git related files and directories - see https://gist.github.com/facelordgists/80e868ff5e315878ecd6
 RUN find . \( -name ".git" -o -name ".gitignore" -o -name ".gitmodules" -o -name ".gitattributes" \) -exec rm -rf -- {} +
 

docker/api/traceability/startup-script-bc.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 # use /bin/sh to be compatible with Alpine / Busybox
+# This script expects cwd to be /fgt-workspace
 rm -rf apihub-root/external-volume/config
 cp -r docker/api/config apihub-root/external-volume/config
-cd /fgt-workspace ; npm run switch-to-test-chain ; npm run server & ( sleep 5s ; npm run build-all ; tail -f /dev/null )
+npm run switch-to-test-chain ; npm run server & ( sleep 5s ; npm run build-all ; tail -f /dev/null )

docker/api/traceability/startup-script.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 # use /bin/sh to be compatible with Alpine / Busybox
+# This script expects cwd to be /fgt-workspace
 rm -rf apihub-root/external-volume/config
 cp -r docker/api/config apihub-root/external-volume/config
-cd /fgt-workspace ; npm run switch-to-simul-chain ; npm run server & ( sleep 5s ; npm run build-all ; tail -f /dev/null )
+npm run switch-to-simul-chain ; npm run server & ( sleep 5s ; npm run build-all ; tail -f /dev/null )