fix: file refactor

.github/workflows/publish-docker-app-images.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - westlad/ping-pong
 
 jobs:
   release:
@@ -29,10 +30,11 @@ jobs:
     - run: echo ${{ steps.semantic.outputs.release-version }}
 
     - name: Docker push version
-      if: steps.semantic.outputs.new-release-published == 'true'
       run: |
         docker build -t ghcr.io/eyblockchain/nightfall3-proposer . -f proposer.Dockerfile
         docker push ghcr.io/eyblockchain/nightfall3-proposer
+      if: steps.semantic.outputs.new-release-published == 'true'
+      run: |
         docker build -t ghcr.io/eyblockchain/nightfall3-proposer:$RELEASE_VERSION . -f proposer.Dockerfile
         docker push ghcr.io/eyblockchain/nightfall3-proposer:$RELEASE_VERSION
       env:
@@ -44,10 +46,11 @@ jobs:
     - run: echo ${{ steps.semantic.outputs.release-version }}
 
     - name: Docker push version
-      if: steps.semantic.outputs.new-release-published == 'true'
       run: |
         docker build -t ghcr.io/eyblockchain/nightfall3-user-local . -f user-local.Dockerfile
         docker push ghcr.io/eyblockchain/nightfall3-user-local
+      if: steps.semantic.outputs.new-release-published == 'true'
+      run: |
         docker build -t ghcr.io/eyblockchain/nightfall3-user-local:$RELEASE_VERSION . -f user-local.Dockerfile
         docker push ghcr.io/eyblockchain/nightfall3-user-local:$RELEASE_VERSION
       env:

proposer.Dockerfile

@@ -1,10 +1,11 @@
 FROM node:14.17
 
-WORKDIR /
+WORKDIR /app
 COPY common-files common-files
-COPY config/default.js app/config/default.js
+COPY config/default.js config/default.js
+COPY cli/lib cli/lib
 
-WORKDIR /app
+WORKDIR /app/test/ping-pong/proposer
 RUN apt-get update -y
 RUN apt-get install -y netcat-openbsd
 COPY test/ping-pong/proposer/package*.json test/ping-pong/proposer/pre-start-script.sh ./
@@ -15,6 +16,6 @@ COPY test/ping-pong/proposer/docker-entrypoint.sh docker-entrypoint.sh
 EXPOSE 8080
 
 RUN npm ci
-ENTRYPOINT ["/app/docker-entrypoint.sh"]
+ENTRYPOINT ["/app/test/ping-pong/proposer/docker-entrypoint.sh"]
 
 CMD ["npm", "start"]

test/ping-pong/docker-compose.yml

@@ -104,10 +104,10 @@ services:
     volumes:
       - type: bind
         source: ../../common-files
-        target: /common-files
+        target: /app/common-files
       - type: bind
         source: ./proposer/src
-        target: /app/src
+        target: /app/test/ping-pong/proposer/src
     environment:
       OPTIMIST_HOST: optimist
       OPTIMIST_WS_PORT: 8080
@@ -124,10 +124,10 @@ services:
     volumes:
       - type: bind
         source: ../../common-files
-        target: /common-files
+        target: /app/common-files
       - type: bind
         source: ./user-local/src
-        target: /app/src
+        target: /app/test/ping-pong/user-local/src
     environment:
       OPTIMIST_HOST: optimist
       OPTIMIST_WS_PORT: 8080

test/ping-pong/proposer/src/index.mjs

@@ -3,7 +3,7 @@ Module that runs up as a proposer
 */
 import config from 'config';
 import logger from 'common-files/utils/logger.mjs';
-import Nf3 from './nf3.mjs';
+import Nf3 from '../../../../cli/lib/nf3.mjs';
 
 const { proposerEthereumSigningKey, optimistWsUrl, web3WsUrl, clientBaseUrl, optimistBaseUrl } =
   config;