fix: prop tree build (#74)

Author: momentiris

.github/workflows/build-and-push.yaml

@@ -69,7 +69,8 @@ jobs:
             type=raw,value=latest,enable={{is_default_branch}}
             type=raw,value=${{ steps.package-version.outputs.version }}
 
-      - name: Build and push
+      - name: Build and push property-base
+        if: matrix.package == 'property-base'
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -80,6 +81,25 @@ jobs:
           cache-from: type=gha,scope=${{ matrix.package }}
           cache-to: type=gha,mode=max,scope=${{ matrix.package }}
 
+      - name: Build and push property-tree
+        if: matrix.package == 'property-tree'
+        uses: docker/build-push-action@v5
+        with:
+          build-args: |
+            VITE_API_URL=http://property-base
+            VITE_CORE_API_URL=http://core
+            VITE_KEYCLOAK_URL=https://auth-test.mimer.nu/realms/onecore-test
+            VITE_KEYCLOAK_CLIENT_ID=onecore-test
+            VITE_KEYCLOAK_REDIRECT_URI=https://property-tree-test.mimer.nu/callback
+            VITE_KEYCLOAK_REALM=onecore-test
+          context: .
+          file: ./packages/${{ matrix.package }}/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=${{ matrix.package }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.package }}
+
   commit-version:
     needs: [build-and-push, determine-version]
     runs-on: ubuntu-latest

packages/property-tree/Dockerfile

@@ -7,6 +7,18 @@ COPY ./package*.json /app/
 
 COPY ./packages/property-tree /app/packages/property-tree
 
+ARG VITE_CORE_API_URL
+ARG VITE_KEYCLOAK_URL
+ARG VITE_KEYCLOAK_CLIENT_ID
+ARG VITE_KEYCLOAK_REDIRECT_URI
+ARG VITE_KEYCLOAK_REALM
+
+ENV VITE_CORE_API_URL=${VITE_CORE_API_URL}
+ENV VITE_KEYCLOAK_URL=${VITE_KEYCLOAK_URL}
+ENV VITE_KEYCLOAK_CLIENT_ID=${VITE_KEYCLOAK_CLIENT_ID}
+ENV VITE_KEYCLOAK_REDIRECT_URI=${VITE_KEYCLOAK_REDIRECT_URI}
+ENV VITE_KEYCLOAK_REALM=${VITE_KEYCLOAK_REALM}
+
 # Install dependencies
 RUN npm ci --workspace packages/property-tree
 

packages/property-tree/nginx.conf

@@ -17,19 +17,6 @@ server {
         proxy_cache_bypass $http_upgrade;
     }
 
-    # API proxy to property-base service
-    location /core/api/ {
-        proxy_pass http://core:80/;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_cache_bypass $http_upgrade;
-    }
-
     # Handle Single Page Application routing
     location / {
         try_files $uri $uri/ /index.html;