cleanup docker files

Author: sm47916

docker-builds/server/Dockerfile

@@ -1,5 +1,5 @@
 FROM --platform=amd64 487920318758.dkr.ecr.eu-central-1.amazonaws.com/cljs-web3-ci:node-20.18.1 as builder
-ARG ETHLANCE_ENV=prod
+ARG ETHLANCE_ENV
 ARG ETHLANCE_DEPLOY_SEED
 USER root
 

docker-builds/ui/Dockerfile

@@ -1,52 +1,49 @@
-FROM --platform=amd64 487920318758.dkr.ecr.us-west-2.amazonaws.com/cljs-web3-ci:node-20.18.1 as init
-ARG BUILD_ENV=qa
-ARG ETHLANCE_DEPLOY_SEED="sign bachelor state zoo expire boat morning situate scene unveil oven crew"
+FROM --platform=amd64 487920318758.dkr.ecr.eu-central-1.amazonaws.com/cljs-web3-ci:node-20.18.1 as builder
+ARG ETHLANCE_ENV
+ARG ETHLANCE_DEPLOY_SEED
 USER root
 
-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 ETHLANCE_DEPLOY_SEED="${ETHLANCE_DEPLOY_SEED}"
-ENV SMART_CONTRACTS_PATH="/build/ethlance/shared/src/ethlance/shared/smart_contracts_${BUILD_ENV}.cljs"
-ENV SMART_CONTRACTS_BUILD_PATH="/build/ethlance/resources/public/contracts/build"
-ENV ETHLANCE_CONFIG_PATH="/build/ethlance/config/${ETHLANCE_COMPONENT}-config-${BUILD_ENV}.edn"
-
-WORKDIR /build/ethlance
+# Set environment variables
+ENV ETHLANCE_SOURCE_ROOT=/build/ethlance \
+    ETHLANCE_ENV=$ETHLANCE_ENV
+ENV ETHLANCE_SERVER_ROOT=${ETHLANCE_SOURCE_ROOT}/server \
+    ETHLANCE_DEPLOY_SEED=${ETHLANCE_DEPLOY_SEED} \
+    SMART_CONTRACTS_BUILD_PATH="${ETHLANCE_SOURCE_ROOT}/resources/public/contracts/build" \
+    SMART_CONTRACTS_PATH="${ETHLANCE_SOURCE_ROOT}/shared/src/ethlance/shared/smart_contracts_${ETHLANCE_ENV}.cljs" \
+    ETHLANCE_CONFIG_PATH="${ETHLANCE_SOURCE_ROOT}/config/server-config-${ETHLANCE_ENV}.edn" \
+    UI_CONFIG_PATH="${ETHLANCE_SOURCE_ROOT}/config/ui-config-${ETHLANCE_ENV}.edn"
+
+# Set working directory and prepare source files
+WORKDIR ${ETHLANCE_SOURCE_ROOT}
 COPY . .
+COPY ethlance-config/config  "${ETHLANCE_SOURCE_ROOT}/config"
 
-RUN cat "${SMART_CONTRACTS_PATH}"
+# Clone required dependencies
+RUN git clone --depth 1 https://github.com/district0x/d0x-libs /build/d0x-libs
 
-# WORKDIR /build/ethlance-config
-# COPY config .
+# Build stage - compile contracts and UI
+# Compile contracts
+RUN yarn install && ETHLANCE_ENV="${ETHLANCE_ENV}" npx truffle compile
 
-WORKDIR /build
-COPY ethlance-config/config  /build/ethlance/config
-RUN git clone https://github.com/district0x/d0x-libs
-
-
-ARG BUILD_ENV=qa
-ARG ETHLANCE_ENV=qa
-FROM init as build_stage
-ENV ETHLANCE_ENV=qa
-WORKDIR $ETHLANCE_SOURCE_ROOT
-RUN yarn install && ETHLANCE_ENV="${BUILD_ENV}" npx truffle compile
-
-WORKDIR $ETHLANCE_SOURCE_ROOT/ui
+# Build UI components
+WORKDIR ${ETHLANCE_SOURCE_ROOT}/ui
 RUN yarn install && \
-    ETHLANCE_ENV="${BUILD_ENV}" npx shadow-cljs release dev-ui && \
+    ETHLANCE_ENV="${ETHLANCE_ENV}" npx shadow-cljs release dev-ui && \
     ./node_modules/less/bin/lessc resources/public/less/main.less resources/public/css/main.css --verbose
 
+# Final stage - using nginx to serve the UI
 FROM nginx:alpine
-ENV ETHLANCE_ENV=qa
+ARG ETHLANCE_ENV
+ENV ETHLANCE_ENV=$ETHLANCE_ENV
 
+# Configure nginx
 COPY docker-builds/ui/ethlance.conf /etc/nginx/conf.d/
 COPY docker-builds/ui/default.conf /etc/nginx/conf.d/default.conf
 COPY docker-builds/ui/nginx.conf /etc/nginx/nginx.conf
 
-COPY --from=build_stage /build/ethlance/resources /deploy/resources
-COPY --from=build_stage /build/ethlance/resources/public/contracts /deploy/ui/contracts/
-COPY --from=build_stage /build/ethlance/ui/resources/public /deploy/ui/
+# Copy built assets from builder stage
+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/
 
 EXPOSE 80