fix: pass env var as env and not build arg

topos-protocol · Aug 3, 2023 · ed8771d · ed8771d
1 parent 0b50536
commit ed8771d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1,13 +1,13 @@
 FROM --platform=linux/amd64 synthetixio/docker-e2e:18.16-ubuntu as base
 
-ARG VITE_EXECUTOR_SERVICE_ENDPOINT
-ARG VITE_SUBNET_REGISTRATOR_CONTRACT_ADDRESS
-ARG VITE_TOPOS_MESSAGING_CONTRACT_ADDRESS
-ARG VITE_TOPOS_CORE_PROXY_CONTRACT_ADDRESS
-ARG VITE_TOPOS_SUBNET_ENDPOINT
-ARG VITE_TRACING_OTEL_COLLECTOR_ENDPOINT
-ARG VITE_TRACING_SERVICE_NAME
-ARG VITE_TRACING_SERVICE_VERSION
+# ARG VITE_EXECUTOR_SERVICE_ENDPOINT
+# ARG VITE_SUBNET_REGISTRATOR_CONTRACT_ADDRESS
+# ARG VITE_TOPOS_MESSAGING_CONTRACT_ADDRESS
+# ARG VITE_TOPOS_CORE_PROXY_CONTRACT_ADDRESS
+# ARG VITE_TOPOS_SUBNET_ENDPOINT
+# ARG VITE_TRACING_OTEL_COLLECTOR_ENDPOINT
+# ARG VITE_TRACING_SERVICE_NAME
+# ARG VITE_TRACING_SERVICE_VERSION
 
 RUN mkdir /app
 WORKDIR /app

diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
@@ -5,15 +5,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.ci
-      args:
-        - VITE_EXECUTOR_SERVICE_ENDPOINT=${VITE_EXECUTOR_SERVICE_ENDPOINT}
-        - VITE_SUBNET_REGISTRATOR_CONTRACT_ADDRESS=${VITE_SUBNET_REGISTRATOR_CONTRACT_ADDRESS}
-        - VITE_ERC20_MESSAGING_CONTRACT_ADDRESS=${VITE_ERC20_MESSAGING_CONTRACT_ADDRESS}
-        - VITE_TOPOS_CORE_PROXY_CONTRACT_ADDRESS=${VITE_TOPOS_CORE_PROXY_CONTRACT_ADDRESS}
-        - VITE_TOPOS_SUBNET_ENDPOINT=${VITE_TOPOS_SUBNET_ENDPOINT}
-        - VITE_TRACING_OTEL_COLLECTOR_ENDPOINT=${VITE_TRACING_OTEL_COLLECTOR_ENDPOINT}
-        - VITE_TRACING_SERVICE_NAME=${VITE_TRACING_SERVICE_NAME}
-        - VITE_TRACING_SERVICE_VERSION=${VITE_TRACING_SERVICE_VERSION}
     environment:
       - DISPLAY=display:0.0
       - CYPRESS_DOCKER_RUN=true
@@ -25,6 +16,14 @@ services:
       - AUTH0_ISSUER_URL=${AUTH0_ISSUER_URL}
       - PORT=${PORT}
       - PRIVATE_KEY=${PRIVATE_KEY}
+      - VITE_EXECUTOR_SERVICE_ENDPOINT=${VITE_EXECUTOR_SERVICE_ENDPOINT}
+      - VITE_SUBNET_REGISTRATOR_CONTRACT_ADDRESS=${VITE_SUBNET_REGISTRATOR_CONTRACT_ADDRESS}
+      - VITE_ERC20_MESSAGING_CONTRACT_ADDRESS=${VITE_ERC20_MESSAGING_CONTRACT_ADDRESS}
+      - VITE_TOPOS_CORE_PROXY_CONTRACT_ADDRESS=${VITE_TOPOS_CORE_PROXY_CONTRACT_ADDRESS}
+      - VITE_TOPOS_SUBNET_ENDPOINT=${VITE_TOPOS_SUBNET_ENDPOINT}
+      - VITE_TRACING_OTEL_COLLECTOR_ENDPOINT=${VITE_TRACING_OTEL_COLLECTOR_ENDPOINT}
+      - VITE_TRACING_SERVICE_NAME=${VITE_TRACING_SERVICE_NAME}
+      - VITE_TRACING_SERVICE_VERSION=${VITE_TRACING_SERVICE_VERSION}
     entrypoint: []
     working_dir: /app
     command: >