Embed Gate app into Thunder

Author: brionmario

.github/workflows/release.yml

@@ -130,9 +130,10 @@ jobs:
             OS="${platform%%:*}"
             ARCH="${platform#*:}"
             
-            echo "🔨 Building Thunder backend for $OS/$ARCH..."
+            echo "🔨 Building Thunder backend & frontend for $OS/$ARCH..."
             make build_backend OS=$OS ARCH=$ARCH
-            
+            make build_frontend OS=$OS ARCH=$ARCH
+
             # Optional: Add a small delay to prevent resource contention
             sleep 1
           done
@@ -163,58 +164,59 @@ jobs:
           git tag -a "$TAG_VERSION" -m "Release $TAG_VERSION"
           git push origin "$TAG_VERSION"
 
-      - name: 🐳 Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      # Docker steps skipped for this release
+      # - name: 🐳 Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v3
 
-      - name: 🔐 Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+      # - name: 🔐 Log in to GitHub Container Registry
+      #   uses: docker/login-action@v3
+      #   with:
+      #     registry: ghcr.io
+      #     username: ${{ github.actor }}
+      #     password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: 📥 Download Shared Certificates for Docker
-        uses: actions/download-artifact@v4
-        with:
-          name: thunder-certificates
-          path: target/out/.cert/
+      # - name: 📥 Download Shared Certificates for Docker
+      #   uses: actions/download-artifact@v4
+      #   with:
+      #     name: thunder-certificates
+      #     path: target/out/.cert/
 
-      - name: 📋 Prepare Docker Build Context
-        run: |
-          # Copy certificates into the Docker build context
-          mkdir -p docker-certs
-          cp target/out/.cert/server.cert docker-certs/
-          cp target/out/.cert/server.key docker-certs/
-          echo "✅ Certificates prepared for Docker build context"
+      # - name: 📋 Prepare Docker Build Context
+      #   run: |
+      #     # Copy certificates into the Docker build context
+      #     mkdir -p docker-certs
+      #     cp target/out/.cert/server.cert docker-certs/
+      #     cp target/out/.cert/server.key docker-certs/
+      #     echo "✅ Certificates prepared for Docker build context"
 
-      - name: 🐳 Build and Push Multi-Arch Docker Image
-        run: |
-          # Convert repository name to lowercase for GHCR
-          REPO_NAME=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
-          IMAGE_NAME="ghcr.io/${REPO_NAME}"
-          
-          # Get version without 'v' prefix for Docker tags
-          DOCKER_VERSION="${{ github.event.inputs.version }}"
-          if [[ $DOCKER_VERSION == v* ]]; then
-            DOCKER_VERSION="${DOCKER_VERSION#v}"
-          fi
-          
-          echo "🐳 Building and pushing Docker image: ${IMAGE_NAME}:${DOCKER_VERSION}"
-          
-          # Build and push multi-arch image with version and latest tags
-          # Pass shared certificates as build context with paths relative to build context
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
-            --tag "${IMAGE_NAME}:${DOCKER_VERSION}" \
-            --tag "${IMAGE_NAME}:latest" \
-            --build-arg CERT_FILE=docker-certs/server.cert \
-            --build-arg KEY_FILE=docker-certs/server.key \
-            --push \
-            .
-          
-          echo "✅ Docker image pushed successfully!"
-          echo "📦 Image available at: ${IMAGE_NAME}:${DOCKER_VERSION}"
-          echo "📦 Image available at: ${IMAGE_NAME}:latest"
+      # - name: 🐳 Build and Push Multi-Arch Docker Image
+      #   run: |
+      #     # Convert repository name to lowercase for GHCR
+      #     REPO_NAME=$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]')
+      #     IMAGE_NAME="ghcr.io/${REPO_NAME}"
+      #     
+      #     # Get version without 'v' prefix for Docker tags
+      #     DOCKER_VERSION="${{ github.event.inputs.version }}"
+      #     if [[ $DOCKER_VERSION == v* ]]; then
+      #       DOCKER_VERSION="${DOCKER_VERSION#v}"
+      #     fi
+      #     
+      #     echo "🐳 Building and pushing Docker image: ${IMAGE_NAME}:${DOCKER_VERSION}"
+      #     
+      #     # Build and push multi-arch image with version and latest tags
+      #     # Pass shared certificates as build context with paths relative to build context
+      #     docker buildx build \
+      #       --platform linux/amd64,linux/arm64 \
+      #       --tag "${IMAGE_NAME}:${DOCKER_VERSION}" \
+      #       --tag "${IMAGE_NAME}:latest" \
+      #       --build-arg CERT_FILE=docker-certs/server.cert \
+      #       --build-arg KEY_FILE=docker-certs/server.key \
+      #       --push \
+      #       .
+      #     
+      #     echo "✅ Docker image pushed successfully!"
+      #     echo "📦 Image available at: ${IMAGE_NAME}:${DOCKER_VERSION}"
+      #     echo "📦 Image available at: ${IMAGE_NAME}:latest"
 
       - name: 📝 Calculate Next Version
         id: next_version

Dockerfile

@@ -17,11 +17,17 @@
 # ----------------------------------------------------------------------------
 
 # WSO2 Thunder Docker Image
-# Build stage - compile the Go binary for the target architecture
+# Build stage - compile the Go binary and build frontend for the target architecture
 FROM golang:1.25-alpine AS builder
 
-# Install build dependencies
-RUN apk add --no-cache git make bash sqlite openssl zip
+# Install build dependencies including Node.js and npm
+RUN apk add --no-cache git make bash sqlite openssl zip nodejs npm
+
+# Install pnpm globally
+RUN npm install -g pnpm
+
+# Set environment variables for CI build
+ENV CI=true
 
 # Set the working directory
 WORKDIR /app
@@ -53,12 +59,12 @@ RUN if [ -n "$CERT_FILE" ] && [ -n "$KEY_FILE" ] && [ -f "$CERT_FILE" ] && [ -f
         echo "✅ New certificates generated"; \
     fi
 
-# Build the binary for the target architecture
+# Build both frontend and backend for the target architecture
 ARG TARGETARCH
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
-        ./build.sh build_backend linux amd64; \
+        ./build.sh build linux amd64; \
     else \
-        ./build.sh build_backend linux arm64; \
+        ./build.sh build linux arm64; \
     fi
 
 # List the contents of the dist directory to verify zip output
@@ -104,11 +110,15 @@ RUN chown -R thunder:thunder /opt/thunder && \
 # Expose the default port
 EXPOSE 8090
 
+# Expose the Gate port
+EXPOSE 9090
+
 # Switch to thunder user
 USER thunder
 
 # Set environment variables
 ENV BACKEND_PORT=8090
+ENV FRONTEND_PORT=9090
 
 # Start the application
 CMD ["./start.sh"]

Makefile

@@ -44,11 +44,14 @@ clean_all:
 clean:
 	./build.sh clean $(OS) $(ARCH)
 
-build: build_backend build_samples
+build: build_backend build_frontend build_samples
 
 build_backend:
 	./build.sh build_backend $(OS) $(ARCH)
 
+build_frontend:
+	./build.sh build_frontend
+
 package_samples:
 	./build.sh package_samples $(OS) $(ARCH)
 
@@ -70,6 +73,7 @@ build_with_coverage:
 	@echo "================================================================"
 	./build.sh test_unit $(OS) $(ARCH)
 	ENABLE_COVERAGE=true ./build.sh build_backend $(OS) $(ARCH)
+	./build.sh build_frontend
 	./build.sh test_integration $(OS) $(ARCH)
 	./build.sh merge_coverage $(OS) $(ARCH)
 	@echo "================================================================"
@@ -101,8 +105,9 @@ help:
 	@echo "  backend                       - Clean, build, and test only the backend."
 	@echo "  clean                         - Remove build artifacts."
 	@echo "  clean_all                     - Remove all build artifacts including distribution files."
-	@echo "  build                         - Build the Go project and frontend, then package."
+	@echo "  build                         - Build the complete Thunder application (backend + frontend + samples)."
 	@echo "  build_backend                 - Build the backend Go application."
+	@echo "  build_frontend                - Build the Next.js frontend applications."
 	@echo "  package_samples               - Package sample applications."
 	@echo "  build_samples                 - Build sample applications."
 	@echo "  test_unit                     - Run unit tests."
@@ -118,7 +123,7 @@ help:
 	@echo "  lint                          - Run golangci-lint on the project."
 	@echo "  help                          - Show this help message."
 
-.PHONY: all prepare clean clean_all build build_samples package_samples run
+.PHONY: all prepare clean clean_all build build_backend build_frontend build_samples package_samples run
 .PHONY: docker-build docker-build-latest docker-build-multiarch 
 .PHONY: docker-build-multiarch-latest docker-build-multiarch-push
 .PHONY: test_unit test_integration build_with_coverage test