docker-compose-hub fix

.github/workflows/build-branch.yml

@@ -1,221 +0,0 @@
-
-name: Docker Branch Build
-
-on:
-  push:
-    branches: 
-      - master
-      - release
-      - qa
-      - develop
-      # - dev/mg-branch-build-2
-  pull_request:
-    types: 
-      - closed
-    branches: 
-      - master
-      - release
-      - qa
-      - develop
-      - mg-test-develop
-
-env:
-  TARGET_BRANCH: ''
-
-jobs:
-  branch_build_and_push:
-    if: ${{ (github.event_name == 'push') || (github.event_name == 'pull_request' && github.event.action =='closed' && github.event.pull_request.merged == true) }}
-    name: Build-Push Web/Space/API/Proxy Docker Image
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3.3.0
-
-      - name: Set Target Branch Name on PR close
-        if: ${{ github.event_name == 'pull_request' && github.event.action =='closed' }}
-        run: echo "TARGET_BRANCH=${{ github.event.pull_request.base.ref }}" >> $GITHUB_ENV
-
-      - name: Set Target Branch Name on other than PR close
-        if: ${{ github.event_name == 'push' }}
-        run: echo "TARGET_BRANCH=${{ github.ref_name }}" >> $GITHUB_ENV
-      
-      - uses: ASzc/change-string-case-action@v2
-        id: gh_branch_upper_lower
-        with:
-          string: ${{env.TARGET_BRANCH}}
-
-      - uses: mad9000/actions-find-and-replace-string@2
-        id: gh_branch_replace_slash
-        with:
-          source: ${{ steps.gh_branch_upper_lower.outputs.lowercase }}
-          find: '/'        
-          replace: '-'
-
-      - uses: mad9000/actions-find-and-replace-string@2
-        id: gh_branch_replace_dot
-        with:
-          source: ${{ steps.gh_branch_replace_slash.outputs.value }}
-          find: '.'        
-          replace: ''
-          
-      - uses: mad9000/actions-find-and-replace-string@2
-        id: gh_branch_clean
-        with:
-          source: ${{ steps.gh_branch_replace_dot.outputs.value }}
-          find: '_'
-          replace: ''
-      - name: Uploading Proxy Source
-        uses: actions/upload-artifact@v3
-        with:
-          name: proxy-src-code
-          path: ./nginx
-      - name: Uploading Backend Source
-        uses: actions/upload-artifact@v3
-        with:
-          name: backend-src-code
-          path: ./apiserver
-      - name: Uploading Web Source
-        uses: actions/upload-artifact@v3
-        with:
-          name: web-src-code
-          path: |
-            ./
-            !./apiserver
-            !./nginx
-            !./deploy
-            !./space
-      
-      - name: Uploading Space Source
-        uses: actions/upload-artifact@v3
-        with:
-          name: space-src-code
-          path: |
-            ./
-            !./apiserver
-            !./nginx
-            !./deploy
-            !./web
-    outputs:
-        gh_branch_name: ${{ steps.gh_branch_clean.outputs.value }}
-
-  # branch_build_push_frontend:
-  #   runs-on: ubuntu-20.04
-  #   needs: [ branch_build_and_push ]
-  #   steps:
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v2.5.0
-
-  #     - name: Login to Docker Hub
-  #       uses: docker/login-action@v2.1.0
-  #       with:
-  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
-  #     - name: Downloading Web Source Code
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: web-src-code
-
-  #     - name: Build and Push Frontend to Docker Container Registry
-  #       uses: docker/build-push-action@v4.0.0
-  #       with:
-  #         context: .
-  #         file: ./web/Dockerfile.web
-  #         platforms: linux/amd64
-  #         tags: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
-  #         push: true
-  #       env:
-  #         DOCKER_BUILDKIT: 1
-  #         DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-
-  # branch_build_push_space:
-  #   runs-on: ubuntu-20.04
-  #   needs: [ branch_build_and_push ]
-  #   steps:
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v2.5.0
-
-  #     - name: Login to Docker Hub
-  #       uses: docker/login-action@v2.1.0
-  #       with:
-  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
-  #     - name: Downloading Space Source Code
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: space-src-code
-
-  #     - name: Build and Push Space to Docker Hub
-  #       uses: docker/build-push-action@v4.0.0
-  #       with:
-  #         context: .
-  #         file: ./space/Dockerfile.space
-  #         platforms: linux/amd64
-  #         tags: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
-  #         push: true
-  #       env:
-  #         DOCKER_BUILDKIT: 1
-  #         DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-
-  # branch_build_push_backend:
-  #   runs-on: ubuntu-20.04
-  #   needs: [ branch_build_and_push ]
-  #   steps:
-  #     - name: Set up Docker Buildx
-  #       uses: docker/setup-buildx-action@v2.5.0
-
-  #     - name: Login to Docker Hub
-  #       uses: docker/login-action@v2.1.0
-  #       with:
-  #         username: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         password: ${{ secrets.DOCKERHUB_TOKEN }}
-  #     - name: Downloading Backend Source Code
-  #       uses: actions/download-artifact@v3
-  #       with:
-  #         name: backend-src-code
-
-  #     - name: Build and Push Backend to Docker Hub
-  #       uses: docker/build-push-action@v4.0.0
-  #       with:
-  #         context: .
-  #         file: ./Dockerfile.api
-  #         platforms: linux/amd64
-  #         push: true
-  #         tags: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
-  #       env:
-  #         DOCKER_BUILDKIT: 1
-  #         DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-  #         DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
-
-  branch_build_push_proxy:
-    runs-on: ubuntu-20.04
-    needs: [ branch_build_and_push ]
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.5.0
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v2.1.0
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Downloading Proxy Source Code
-        uses: actions/download-artifact@v3
-        with:
-          name: proxy-src-code
-
-      - name: Build and Push Plane-Proxy to Docker Hub
-        uses: docker/build-push-action@v4.0.0
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy-private:${{ needs.branch_build_and_push.outputs.gh_branch_name }}
-          push: true
-        env:
-          DOCKER_BUILDKIT: 1
-          DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKET_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}

.gitignore

@@ -73,7 +73,3 @@ pnpm-lock.yaml
 pnpm-workspace.yaml
 
 .npmrc
-.secrets
-tmp/
-## packages
-dist

docker-compose-hub.yml

@@ -41,10 +41,10 @@ services:
                         - PGPASSWORD=${PGPASSWORD:-plane}
                         - PGHOST=${PGHOST:-plane-db}
                         - PGDATABASE=${PGDATABASE:-plane}
-                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}}
+                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER:-plane}:${PGPASSWORD:-plane}@${PGHOST:-plane-db}/${PGDATABASE:-plane}}
                         - REDIS_HOST=${REDIS_HOST:-plane-redis}
                         - REDIS_PORT=${REDIS_PORT:-6379}
-                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
+                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST:-plane-redis}:6379/}
                         - EMAIL_HOST=${EMAIL_HOST:-""}
                         - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
                         - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
@@ -71,6 +71,7 @@ services:
                         - ENABLE_EMAIL_PASSWORD=${ENABLE_EMAIL_PASSWORD:-1}
                         - ENABLE_MAGIC_LINK_LOGIN=${ENABLE_MAGIC_LINK_LOGIN:-0}
                         - SECRET_KEY=${SECRET_KEY:-60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5}
+                        - WEB_URL=${WEB_URL:-http://localhost}
                 depends_on:
                         - plane-db
                         - plane-redis
@@ -89,10 +90,10 @@ services:
                         - PGPASSWORD=${PGPASSWORD:-plane}
                         - PGHOST=${PGHOST:-plane-db}
                         - PGDATABASE=${PGDATABASE:-plane}
-                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}}
+                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER:-plane}:${PGPASSWORD:-plane}@${PGHOST:-plane-db}/${PGDATABASE:-plane}}
                         - REDIS_HOST=${REDIS_HOST:-plane-redis}
                         - REDIS_PORT=${REDIS_PORT:-6379}
-                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
+                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST:-plane-redis}:6379/}
                         - EMAIL_HOST=${EMAIL_HOST:-""}
                         - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
                         - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
@@ -136,10 +137,10 @@ services:
                         - PGPASSWORD=${PGPASSWORD:-plane}
                         - PGHOST=${PGHOST:-plane-db}
                         - PGDATABASE=${PGDATABASE:-plane}
-                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER}:${PGPASSWORD}@${PGHOST}/${PGDATABASE}}
+                        - DATABASE_URL=${DATABASE_URL:-postgresql://${PGUSER:-plane}:${PGPASSWORD:-plane}@${PGHOST:-plane-db}/${PGDATABASE:-plane}}
                         - REDIS_HOST=${REDIS_HOST:-plane-redis}
                         - REDIS_PORT=${REDIS_PORT:-6379}
-                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST}:6379/}
+                        - REDIS_URL=${REDIS_URL:-redis://${REDIS_HOST:-plane-redis}:6379/}
                         - EMAIL_HOST=${EMAIL_HOST:-""}
                         - EMAIL_HOST_USER=${EMAIL_HOST_USER:-""}
                         - EMAIL_HOST_PASSWORD=${EMAIL_HOST_PASSWORD:-""}
@@ -218,7 +219,7 @@ services:
                 platform: linux/amd64
                 image: makeplane/plane-proxy:latest
                 ports:
-                        - ${NGINX_PORT}:80
+                        - ${NGINX_PORT:-80}:80
                 environment:
                         - NGINX_PORT=${NGINX_PORT:-80}
                         - FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-5242880}