Fix UI does not build

axonivy-market · Jul 19, 2024 · a7bf9eb · a7bf9eb
1 parent cb248f3
commit a7bf9eb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 30 deletions.
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -30,9 +30,10 @@ jobs:
             sed -i "s/^SERVICE_MONGODB_USER=.*$/SERVICE_MONGODB_USER=$SERVICE_USERNAME/" $ENV_FILE
             sed -i "s/^SERVICE_MONGODB_PASSWORD=.*$/SERVICE_MONGODB_PASSWORD=$SERVICE_PASSWORD/" $ENV_FILE
             sed -i "s/^MARKET_GITHUB_TOKEN=.*$/MARKET_GITHUB_TOKEN=$GH_TOKEN/" $ENV_FILE
+            sed -i "s/^MARKETPLACE_INSTALLATION_URL=.*$/MARKETPLACE_INSTALLATION_URL=dummy/" $ENV_FILE
 
       - name: Refresh Docker images
         working-directory: ./marketplace-build
         run: |
           docker compose down
-          docker compose -f docker-compose.yml up -d
+          docker compose up -d
diff --git a/marketplace-build/.env b/marketplace-build/.env
@@ -4,4 +4,5 @@ SERVICE_MONGODB_HOST=
 SERVICE_MONGODB_USER=
 SERVICE_MONGODB_PASSWORD=
 SERVICE_MONGODB_DATABASE=
-MARKET_GITHUB_TOKEN=
+MARKET_GITHUB_TOKEN=
+MARKETPLACE_INSTALLATION_URL=
diff --git a/marketplace-build/docker-compose.yml b/marketplace-build/docker-compose.yml
@@ -40,6 +40,7 @@ services:
       - MONGODB_USERNAME=${SERVICE_MONGODB_USER}
       - MONGODB_PASSWORD=${SERVICE_MONGODB_PASSWORD}
       - MARKET_GITHUB_TOKEN=${MARKET_GITHUB_TOKEN}
+      - MARKETPLACE_INSTALLATION_URL=${MARKETPLACE_INSTALLATION_URL}
     build:
       context: ../marketplace-service
       dockerfile: Dockerfile

diff --git a/marketplace-ui/Dockerfile b/marketplace-ui/Dockerfile
@@ -8,4 +8,4 @@ RUN npm run build --prod
 # Stage 2: Serve Angular app using Nginx
 FROM nginx:alpine
 COPY --from=build-angular /app/dist/browser /usr/share/nginx/html
-COPY --from=assets ./config/nginx/nginx.conf /etc/nginx/nginx.conf
+COPY --from=assets config/nginx/nginx.conf /etc/nginx/nginx.conf
diff --git a/marketplace-ui/nginx.conf b/marketplace-ui/nginx.conf