fix args

district0x · Jun 21, 2024 · f31067b · f31067b
1 parent 9428bc6
commit f31067b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/docker-builds/server/Dockerfile b/docker-builds/server/Dockerfile
@@ -1,5 +1,6 @@
-ARG BUILD_ENV
 FROM --platform=amd64 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-18.17.0 as init
+ARG BUILD_ENV
+ENV BUILD_ENV=${BUILD_ENV}
 USER root
 
 ENV ETHLANCE_COMPONENT="server"
@@ -24,8 +25,9 @@ COPY config .
 WORKDIR /build
 # RUN git clone https://github.com/district0x/d0x-libs
 
-ARG BUILD_ENV
 FROM init as build_server
+ARG BUILD_ENV
+ENV BUILD_ENV=${BUILD_ENV}
 WORKDIR $ETHLANCE_SOURCE_ROOT
 RUN yarn install && ETHLANCE_ENV="${BUILD_ENV}" npx truffle compile
 
@@ -39,11 +41,12 @@ RUN yarn && \
 WORKDIR "${ETHLANCE_SOURCE_ROOT}/server"
 RUN yarn && npx shadow-cljs release dev-server
 
-ARG BUILD_ENV
 FROM node:18
+ARG BUILD_ENV
+ENV BUILD_ENV=${BUILD_ENV}
+ENV ETHLANCE_ENV=${BUILD_ENV}
 ENV ETHLANCE_SOURCE_ROOT=/deploy
 ENV ETHLANCE_SERVER_ROOT=/deploy/server
-ENV ETHLANCE_ENV=qa
 ENV DEPLOY_TARGET=/deploy
 ENV UI_CONFIG_PATH="/deploy/resources/config/ui-config-${BUILD_ENV}.edn"
 ENV SERVER_CONFIG_PATH="/deploy/resources/config/server-config-${BUILD_ENV}.edn"

diff --git a/docker-builds/ui/Dockerfile b/docker-builds/ui/Dockerfile
@@ -1,11 +1,11 @@
-ARG BUILD_ENV
 FROM --platform=amd64 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-18.17.0 as init
+ARG BUILD_ENV
 USER root
-
+ENV BUILD_ENV=${BUILD_ENV}
+ENV ETHLANCE_ENV=$BUILD_ENV
 ENV ETHLANCE_COMPONENT="ui"
 ENV ETHLANCE_SOURCE_ROOT=/build/ethlance
 ENV ETHLANCE_SERVER_ROOT=/build/ethlance/server
-ENV ETHLANCE_ENV=$BUILD_ENV
 ENV DEPLOY_TARGET=/deploy/
 
 ENV SMART_CONTRACTS_PATH="/build/ethlance/shared/src/ethlance/shared/smart_contracts_${BUILD_ENV}.cljs"
@@ -23,8 +23,9 @@ COPY config .
 # WORKDIR /build
 # RUN git clone https://github.com/district0x/d0x-libs
 
-ARG BUILD_ENV
 FROM init as build_stage
+ARG BUILD_ENV
+ENV BUILD_ENV=${BUILD_ENV}
 ENV ETHLANCE_ENV=${BUILD_ENV}
 WORKDIR $ETHLANCE_SOURCE_ROOT
 RUN yarn install && ETHLANCE_ENV="${BUILD_ENV}" npx truffle compile
@@ -34,8 +35,9 @@ RUN yarn install && \
     ETHLANCE_ENV="${BUILD_ENV}" npx shadow-cljs release dev-ui && \
     ./node_modules/less/bin/lessc resources/public/less/main.less resources/public/css/main.css --verbose
 
-ARG BUILD_ENV
 FROM nginx:alpine
+ARG BUILD_ENV
+ENV BUILD_ENV=${BUILD_ENV}
 ENV ETHLANCE_ENV=${BUILD_ENV}
 
 COPY docker-builds/ui/ethlance.conf /etc/nginx/conf.d/