Merge pull request #62 from hhftechnology/traefik-int

Traefik int

Author: hhftechnology

.github/workflows/main.yml

@@ -3,9 +3,7 @@ name: Build and Push Docker Image
 on:
   push:
     branches:
-      - main
-      - master
-      - dev
+      - traefik-int
     paths:
       - 'Dockerfile'
       - 'go.mod'
@@ -19,9 +17,6 @@ on:
       - 'models/**'
       - 'services/**'
       - 'ui/**'
-
-    tags:
-      - 'v*'
   workflow_dispatch:
 
 env:
@@ -53,57 +48,23 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # Get current date for image tags
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
-      
       # Prepare tags based on branch and version
       - name: Prepare Docker tags
         id: docker_tags
         run: |
           TAGS=""
-          
-          # Add branch-specific tags
-          if [[ "${{ github.ref_name }}" == "main" || "${{ github.ref_name }}" == "master" ]]; then
-            # For main/master branch, add latest tag
-            TAGS="$TAGS ${{ env.DOCKERHUB_IMAGE_NAME }}:latest"
-          elif [[ "${{ github.ref_name }}" == "dev" ]]; then
-            # For dev branch
-            TAGS="$TAGS ${{ env.DOCKERHUB_IMAGE_NAME }}:dev"
-          elif [[ "${{ github.ref_type }}" == "branch" ]]; then
-            # For other branches
-            TAGS="$TAGS ${{ env.DOCKERHUB_IMAGE_NAME }}:${{ github.ref_name }}"
-          fi
-          
-          # Add sha tag for all branches
-          if [[ "${{ github.ref_type }}" == "branch" ]]; then
-            TAGS="$TAGS,${{ env.DOCKERHUB_IMAGE_NAME }}:sha-${GITHUB_SHA::7}"
-          fi
-          
-          # Add version tag for tagged releases
-          if [[ "${{ github.ref_type }}" == "tag" && "${{ github.ref }}" == refs/tags/v* ]]; then
-            VERSION="${{ github.ref_name }}"
-            
-            # Add full version tag
-            TAGS="$TAGS,${{ env.DOCKERHUB_IMAGE_NAME }}:$VERSION"
+          if [[ "${{ github.ref_type }}" == "branch" && "${{ github.ref_name }}" == "traefik-int" ]]; then
+            TAGS="${{ env.DOCKERHUB_IMAGE_NAME }}:traefik-int"
           fi
-          
-          # Add date tag for all builds
-          TAGS="$TAGS,${{ env.DOCKERHUB_IMAGE_NAME }}:${{ steps.date.outputs.date }}"
-          
-          # Remove leading space or comma if present
-          TAGS=$(echo "$TAGS" | sed 's/^[ ,]*//')
-          
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
           echo "Docker tags: $TAGS"
 
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
-          push: true
+          push: ${{ steps.docker_tags.outputs.tags != '' }} # IMPORTANT: Only push if tags were generated
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.docker_tags.outputs.tags }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max

README.md

@@ -395,14 +395,27 @@ Switch `active_data_source` and update URLs/credentials via the **Settings** pan
 go run main.go 
 # For build:
 # go build -o middleware-manager main.go
+
+```
+Tip: Use this command if you need to set a hostname record in /etc/hosts for pangolin based on the internal IP for the pangolin container
+```
+docker network inspect -v pangolin
 ```
 
 ### Frontend
 
 ```bash
 cd ui
-# If node_modules is missing: npm install (or yarn install)
-npm start # or yarn start
+cp src/package.json .
+npm install
+npm start
+```
+Note: if you are getting an error such as `options.allowedHosts[0] should be a non-empty string`
+
+you should create a .env file in /ui folder. Do not do this in production (development only)
+
+```sh
+DANGEROUSLY_DISABLE_HOST_CHECK=true
 ```
 
 ## License

api/handlers/resources.go

@@ -55,7 +55,7 @@ func (h *ResourceHandler) GetResources(c *gin.Context) {
 		}
 
 		// Use default priority if null
-		priority := 100 // Default value
+		priority := 200 // Default value
 		if routerPriority.Valid {
 			priority = int(routerPriority.Int64)
 		}
@@ -133,7 +133,7 @@ func (h *ResourceHandler) GetResource(c *gin.Context) {
     }
 
     // Use default priority if null
-    priority := 100 // Default value
+    priority := 200 // Default value
     if routerPriority.Valid {
         priority = int(routerPriority.Int64)
     }
@@ -268,9 +268,9 @@ func (h *ResourceHandler) AssignMiddleware(c *gin.Context) {
 		return
 	}
 
-	// Default priority is 100 if not specified
+	// Default priority is 200 if not specified
 	if input.Priority <= 0 {
-		input.Priority = 100
+		input.Priority = 200
 	}
 
 	// Verify resource exists
@@ -428,9 +428,9 @@ func (h *ResourceHandler) AssignMultipleMiddlewares(c *gin.Context) {
     log.Printf("Assigning %d middlewares to resource %s", len(input.Middlewares), resourceID)
 
     for _, mw := range input.Middlewares {
-        // Default priority is 100 if not specified
+        // Default priority is 200 if not specified
         if mw.Priority <= 0 {
-            mw.Priority = 100
+            mw.Priority = 200
         }
 
         // Verify middleware exists