first steps towards support for arm64

docker/codex_multiarch.Dockerfile

@@ -0,0 +1,18 @@
+FROM ubuntu:lunar-20230415 AS builder
+RUN apt-get update && apt-get install -y git cmake curl make bash lcov build-essential nim
+RUN echo 'export NIMBLE_DIR="${HOME}/.nimble"' >> "${HOME}/.bash_env"
+RUN echo 'export PATH="${NIMBLE_DIR}/bin:${PATH}"' >> "${HOME}/.bash_env"
+
+WORKDIR /src
+COPY . .
+RUN make clean
+RUN make -j4 update
+RUN make -j4 NIM_PARAMS="-d:disableMarchNative"
+
+FROM ubuntu:lunar-20230415
+WORKDIR /root
+RUN apt-get update && apt-get install -y libgomp1 bash
+COPY --from=builder /src/build/codex ./
+COPY --from=builder /src/docker/startCodex.sh ./
+RUN chmod +x ./startCodex.sh
+CMD ["/bin/bash", "-l", "-c", "./startCodex.sh"]

docker/docker-compose.yaml

@@ -1,9 +1,6 @@
 services:
   codex-node1:
-    image: clustertest-nim-codex
+    image: status-im/codexsetup_multiarch:latest
-    build:
-      context: ../.
-      dockerfile: docker/codex.Dockerfile
     ports:
       - 8080:8080
     # Available environment variables:
@@ -25,53 +22,5 @@ services:
       # - ETH_PROVIDER=eth
       # - ETH_ACCOUNT=account
       # - ETH_DEPLOYMENT=deploy
-    volumes:
-      - ./hostdatadir/node1:/datadir
-    networks:
-      - primary
 
-  # Example with metrics enabled.
-  codex-node2:
-    image: clustertest-nim-codex
-    ports:
-      - 8081:8080
-      - 9090:9090
-    environment:
-      - METRICS_ADDR=0.0.0.0
-      - METRICS_PORT=9090
-    volumes:
-      - ./hostdatadir/node2:/datadir
-    depends_on:
-      - codex-node1
-    networks:
-      - primary
-      - secondary
 
-  codex-node3:
-    image: clustertest-nim-codex
-    ports:
-      - 8082:8080
-    volumes:
-      - ./hostdatadir/node3:/datadir
-    depends_on:
-      - codex-node1
-    networks:
-      - secondary
-
-  prometheus:
-    image: prom/prometheus:v2.30.3
-    ports:
-      - 9000:9090
-    volumes:
-      - ./prometheus:/etc/prometheus
-      - ./prometheus-data:/prometheus
-    command: --web.enable-lifecycle --config.file=/etc/prometheus/prometheus.yml
-    networks:
-      - primary
-      - secondary
-
-networks:
-  primary:
-    name: primary
-  secondary:
-    name: secondary

docker/startCodex.sh

@@ -3,7 +3,7 @@ echo "Starting Codex..."
 args=""
 
 ## local ip as NAT?
-do_nat=$(ifconfig eth0 | awk '/inet addr/ {gsub("addr:", "", $2); print $2}')
+do_nat=$(hostname -i)
 echo "got nat:$do_nat"
 
 # Required arguments
@@ -122,5 +122,5 @@ if [ -n "$ETH_PROVIDER" ] && [ -n "$ETH_ACCOUNT" ] && [ -n "$ETH_MARKETPLACE_ADD
     args="$args --eth-deployment=/root/marketplace_address.json"
 fi
 
-echo "./root/codex $args"
+echo "./codex $args"
-sh -c "/root/codex $args"
+/bin/bash -l -c "./codex $args"