update docker builds

Author: sm47916

docker-builds/server/Dockerfile

@@ -1,5 +1,5 @@
 ARG DOCKER_REGISTRY
-FROM --platform=amd64 $DOCKER_REGISTRY/cljs-web3-ci:node-20.18.1 AS builder
+FROM $DOCKER_REGISTRY/cljs-web3-ci:node-20.18.1 AS builder
 
 ARG ETHLANCE_ENV
 ARG ETHLANCE_DEPLOY_SEED

docker-builds/ui/Dockerfile

@@ -1,5 +1,5 @@
 ARG DOCKER_REGISTRY
-FROM --platform=amd64 $DOCKER_REGISTRY/cljs-web3-ci:node-20.18.1 AS builder
+FROM $DOCKER_REGISTRY/cljs-web3-ci:node-20.18.1 AS builder
 
 ARG ETHLANCE_ENV
 ARG ETHLANCE_DEPLOY_SEED
@@ -48,5 +48,5 @@ COPY docker-builds/ui/nginx.conf /etc/nginx/nginx.conf
 COPY --from=builder /build/ethlance/resources /deploy/resources
 COPY --from=builder /build/ethlance/resources/public/contracts /deploy/ui/contracts/
 COPY --from=builder /build/ethlance/ui/resources/public /deploy/ui/
-
+COPY --from=builder /build/ethlance/config /deploy/config
 EXPOSE 80

docker-compose.yml

@@ -8,42 +8,45 @@ services:
             POSTGRES_PASSWORD: test
             POSTGRES_DB: test
     server:
-        image: ethlance-server:latest
+        image: ${DOCKER_REGISTRY:-}ethlance-server:latest
         container_name: ethlance-server
         build:
             context: .
             dockerfile: "docker-builds/server/Dockerfile"
             args:
-                ETHLANCE_ENV: "qa"
+                ETHLANCE_ENV: ETHLANCE_ENV
+                DOCKER_REGISTRY: ${DOCKER_REGISTRY}
         ports:
             - 6300:6300
         command: ["node", "ethlance_server.js"]
         environment:
-            ETHLANCE_ENV: "qa"
+            ETHLANCE_ENV: ${ETHLANCE_ENV}
     ui:
-        image: ethlance-ui:latest
+        image: ${DOCKER_REGISTRY:-}ethlance-ui:latest
         container_name: ethlance-ui
         ports:
             - 9080:80
         build:
             context: .
             dockerfile: "docker-builds/ui/Dockerfile"
             args:
-                ETHLANCE_ENV: "qa"
+                ETHLANCE_ENV: ${ETHLANCE_ENV}
+                DOCKER_REGISTRY: ${DOCKER_REGISTRY}
         depends_on:
             - server
         environment:
-            ETHLANCE_ENV: "qa"
+            ETHLANCE_ENV: ${ETHLANCE_ENV}
 
     #  Collect deps, compiles and deploys contracts
     base:
-        image: ethlance-base:local
+        image: ${DOCKER_REGISTRY:-}ethlance-base:local
         container_name: ethlance-base
         command: ["exit", "0"]
         build:
             context: .
             dockerfile: "docker-builds/base/Dockerfile"
             args:
-                ETHLANCE_ENV: "qa"
+                ETHLANCE_ENV: ${ETHLANCE_ENV}
+                DOCKER_REGISTRY: ${DOCKER_REGISTRY}
         environment:
-            ETHLANCE_ENV: "qa"
+            ETHLANCE_ENV: ${ETHLANCE_ENV}