fix ecr auth

Author: sm47916

.github/workflows/docker-image-prod.yml

@@ -64,15 +64,15 @@ jobs:
           file: docker-builds/server/Dockerfile
           build-args: BUILD_ENV=${{ matrix.env }}
           push: true
-          tags: ${{ secrets.ETHLANCE_PROD_ECR_PREFIX }}/ethlance-${{ matrix.env }}-server:${{ github.sha }}, ${{ secrets.ETHLANCE_PROD_ECR_PREFIX }}/ethlance-${{ matrix.env }}-server:latest
+          tags: ${{ secrets.ECR_REGISTRY }}/ethlance-${{ matrix.env }}-server:${{ github.sha }}, ${{ secrets.ECR_REGISTRY }}/ethlance-${{ matrix.env }}-server:latest
 
-      # - name: Build and push UI
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     context: .
-      #     platforms: linux/amd64
-      #     builder: ${{ steps.setup-buildx.outputs.name }}
-      #     file: docker-builds/ui/Dockerfile
-      #     build-args: BUILD_ENV=${{ matrix.env }}
-      #     push: true
-      #     tags: ${{ secrets.ETHLANCE_PROD_ECR_PREFIX }}/ethlance-${{ matrix.env }}-ui:${{ github.sha }}, ${{ secrets.ETHLANCE_PROD_ECR_PREFIX }}/ethlance-${{ matrix.env }}-server:latest
+      - name: Build and push UI
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64
+          builder: ${{ steps.setup-buildx.outputs.name }}
+          file: docker-builds/ui/Dockerfile
+          build-args: BUILD_ENV=${{ matrix.env }}
+          push: true
+          tags: ${{ secrets.ECR_REGISTRY }}/ethlance-${{ matrix.env }}-ui:${{ github.sha }}, ${{ secrets.ECR_REGISTRY }}/ethlance-${{ matrix.env }}-server:latest

docker-builds/server/Dockerfile

@@ -15,12 +15,6 @@ ENV ETHLANCE_SERVER_ROOT=${ETHLANCE_SOURCE_ROOT}/server \
 WORKDIR ${ETHLANCE_SOURCE_ROOT}
 COPY . .
 
-RUN ls -lah
-RUN cat "${SMART_CONTRACTS_PATH}"
-
-# # WORKDIR /build/ethlance-config/
-# # COPY ethlance-config .
-
 # # WORKDIR /build
 COPY ethlance-config/config  "${ETHLANCE_SOURCE_ROOT}/config"
 
@@ -42,35 +36,16 @@ RUN yarn && npx shadow-cljs release dev-server
 
 # Final stage - minimal runtime image
 FROM node:20-slim
-# # ENV ETHLANCE_ENV=prod \
-# #     ETHLANCE_SOURCE_ROOT=/build/ethlance \
-# #     ETHLANCE_SERVER_ROOT=${ETHLANCE_SOURCE_ROOT}/server \
-# #     UI_CONFIG_PATH="${ETHLANCE_SOURCE_ROOT}/config/ui-config-${ETHLANCE_ENV}.edn" \
-# #     ETHLANCE_CONFIG_PATH="${ETHLANCE_SOURCE_ROOT}/config/server-config-${ETHLANCE_ENV}.edn"
-
-# #     WORKDIR "${ETHLANCE_SERVER_ROOT}"
-# #     COPY --from=builder /build /build
-# # # COPY --from=build_server /build/ethlance/config/ui-config-${ETHLANCE_ENV}.edn /deploy/resources/config/ui-config-${ETHLANCE_ENV}.edn
-# # # COPY --from=build_server /build/ethlance/config/server-config-${ETHLANCE_ENV}.edn /deploy/resources/config/server-config-${ETHLANCE_ENV}.edn
-# # # COPY --from=build_server /build/ethlance/resources /deploy/resources
-# # # COPY --from=build_server /build/ethlance/server/node_modules /deploy/server/node_modules/
-# # # COPY --from=build_server /build/ethlance/server/package.json /build/ethlance/server/out/ethlance_server* /deploy/server/
-# # # COPY --from=build_server /build/ethlance/resources/public/contracts /deploy/ui/contracts/
-# # # COPY --from=build_server /build/ethlance/ui/resources/public/* /deploy/ui/
-# # RUN echo -n "{:last-processed-block 27409455}" > ethlance-events.log
-# # CMD [ "node", "out/ethlance_server.js" ]
-
 ENV ETHLANCE_ENV=prod \
-    ETHLANCE_SOURCE_ROOT=/build/ethlance \
-    ETHLANCE_SERVER_ROOT=/build/ethlance/server \
+    ETHLANCE_SOURCE_ROOT=/build/ethlance
+ENV ETHLANCE_SERVER_ROOT=/build/ethlance/server \
     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" \
     UI_CONFIG_PATH="/build/ethlance/config/ui-config-prod.edn" \
     ETHLANCE_CONFIG_PATH="/build/ethlance/config/server-config-prod.edn"
 
 WORKDIR ${ETHLANCE_SERVER_ROOT}
 
-# Only copy what's needed for runtime
 COPY --from=builder /build /build
 # COPY --from=builder /build/ethlance/config/ui-config-prod.edn /build/ethlance/config/ui-config-prod.edn
 # COPY --from=builder /build/ethlance/config/server-config-prod.edn /build/ethlance/config/server-config-prod.edn