chore: modified dockerfiles for space and web (#1987)

Co-authored-by: Aaryan Khandelwal <aaryan610@Aaryans-MacBook-Pro.local>

.eslintrc.js

@@ -4,7 +4,7 @@ module.exports = {
   extends: ["custom"],
   settings: {
     next: {
-      rootDir: ["apps/*"],
+      rootDir: ["web/", "deploy/"],
     },
   },
 };

Dockerfile

@@ -5,9 +5,11 @@ WORKDIR /app
 ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
 
 RUN yarn global add turbo
+RUN apk add tree
 COPY . .
 
-RUN turbo prune --scope=app --docker
+RUN turbo prune --scope=app --scope=plane-deploy --docker
+CMD tree -I node_modules/
 
 # Add lockfile and package.json's of isolated subworkspace
 FROM node:18-alpine AS installer
@@ -21,14 +23,14 @@ COPY --from=builder /app/out/json/ .
 COPY --from=builder /app/out/yarn.lock ./yarn.lock
 RUN yarn install
 
-# Build the project
+# # Build the project
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
 COPY replace-env-vars.sh /usr/local/bin/
 USER root
 RUN chmod +x /usr/local/bin/replace-env-vars.sh
 
-RUN yarn turbo run build --filter=app
+RUN yarn turbo run build
 
 ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
     BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
@@ -96,11 +98,16 @@ RUN adduser --system --uid 1001 captain
 
 COPY --from=installer /app/apps/app/next.config.js .
 COPY --from=installer /app/apps/app/package.json .
+COPY --from=installer /app/apps/space/next.config.js .
+COPY --from=installer /app/apps/space/package.json .
 
 COPY --from=installer --chown=captain:plane /app/apps/app/.next/standalone ./
 
 COPY --from=installer --chown=captain:plane /app/apps/app/.next/static ./apps/app/.next/static
 
+COPY --from=installer --chown=captain:plane /app/apps/space/.next/standalone ./
+COPY --from=installer --chown=captain:plane /app/apps/space/.next ./apps/space/.next
+
 ENV NEXT_TELEMETRY_DISABLED 1
 
 # RUN rm /etc/nginx/conf.d/default.conf

apiserver/plane/api/serializers/cycle.py

@@ -14,6 +14,11 @@ from plane.db.models import Cycle, CycleIssue, CycleFavorite
 
 class CycleWriteSerializer(BaseSerializer):
 
+    def validate(self, data):
+        if data.get("start_date", None) is not None and data.get("end_date", None) is not None and data.get("start_date", None) > data.get("end_date", None):
+            raise serializers.ValidationError("Start date cannot exceed end date")
+        return data
+
     class Meta:
         model = Cycle
         fields = "__all__"
@@ -35,6 +40,11 @@ class CycleSerializer(BaseSerializer):
     started_estimates = serializers.IntegerField(read_only=True)
     workspace_detail = WorkspaceLiteSerializer(read_only=True, source="workspace")
     project_detail = ProjectLiteSerializer(read_only=True, source="project")
+
+    def validate(self, data):
+        if data.get("start_date", None) is not None and data.get("end_date", None) is not None and data.get("start_date", None) > data.get("end_date", None):
+            raise serializers.ValidationError("Start date cannot exceed end date")
+        return data
     
     def get_assignees(self, obj):
         members = [

apiserver/plane/api/serializers/module.py

@@ -40,6 +40,11 @@ class ModuleWriteSerializer(BaseSerializer):
             "updated_at",
         ]
 
+    def validate(self, data):
+        if data.get("start_date", None) is not None and data.get("target_date", None) is not None and data.get("start_date", None) > data.get("target_date", None):
+            raise serializers.ValidationError("Start date cannot exceed target date")
+        return data    
+
     def create(self, validated_data):
         members = validated_data.pop("members_list", None)
 

apiserver/plane/bgtasks/export_task.py

@@ -68,7 +68,7 @@ def create_zip_file(files):
 def upload_to_s3(zip_file, workspace_id, token_id, slug):
     s3 = boto3.client(
         "s3",
-        region_name="ap-south-1",
+        region_name=settings.AWS_REGION,
         aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
         aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY,
         config=Config(signature_version="s3v4"),

app.json

@@ -1,85 +0,0 @@
-{
-  "name": "Plane",
-  "description": "Plane helps you track your issues, epics, and product roadmaps.",
-  "repository": "http://github.com/makeplane/plane",
-  "logo": "https://avatars.githubusercontent.com/u/115727700?s=200&v=4",
-  "website": "https://plane.so/",
-  "success_url": "/",
-  "stack": "heroku-22",
-  "keywords": [
-    "plane",
-    "project management",
-    "django",
-    "next"
-  ],
-  "addons": [
-    "heroku-postgresql:mini",
-    "heroku-redis:mini"
-  ],
-  "buildpacks": [
-    {
-      "url": "https://github.com/heroku/heroku-buildpack-python.git"
-    },
-    {
-      "url": "https://github.com/heroku/heroku-buildpack-nodejs#v176"
-    }
-  ],
-  "env": {
-    "EMAIL_HOST": {
-      "description": "Email host to send emails from",
-      "value": ""
-    },
-    "EMAIL_HOST_USER": {
-      "description": "Email host to send emails from",
-      "value": ""
-    },
-    "EMAIL_HOST_PASSWORD": {
-      "description": "Email host to send emails from",
-      "value": ""
-    },
-    "EMAIL_FROM": {
-      "description": "Email Sender",
-      "value": ""
-    },
-    "EMAIL_PORT": {
-      "description": "The default Email PORT to use",
-      "value": "587"
-    },
-    "AWS_REGION": {
-      "description": "AWS Region to use for S3",
-      "value": "false"
-    },
-    "AWS_ACCESS_KEY_ID": {
-      "description": "AWS Access Key ID to use for S3",
-      "value": ""
-    },
-    "AWS_SECRET_ACCESS_KEY": {
-      "description": "AWS Secret Access Key to use for S3",
-      "value": ""
-    },
-    "AWS_S3_BUCKET_NAME": {
-      "description": "AWS Bucket Name to use for S3",
-      "value": ""
-    },
-    "SENTRY_DSN": {
-      "description": "",
-      "value": ""
-    },
-    "WEB_URL": {
-      "description": "Web URL for Plane this will be used for redirections in the emails",
-      "value": ""
-    },
-    "GITHUB_CLIENT_SECRET": {
-      "description": "Github Client Secret",
-      "value": ""
-    },
-    "NEXT_PUBLIC_API_BASE_URL": {
-      "description": "Next Public API Base URL",
-      "value": ""
-    },
-    "SECRET_KEY": {
-      "description": "Django Secret Key",
-      "value": ""
-    }
-  }
-}

apps/app/.eslintrc.js

@@ -1,7 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ["custom"],
-  rules: {
-    "@next/next/no-img-element": "off",
-  },
-};

apps/app/Dockerfile.dev

@@ -1,11 +0,0 @@
-FROM node:18-alpine
-RUN apk add --no-cache libc6-compat
-# Set working directory
-WORKDIR /app
-
-
-COPY . .
-RUN yarn global add turbo
-RUN yarn install
-EXPOSE 3000
-CMD ["yarn","dev"]

apps/app/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "tsconfig/nextjs.json",
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"],
-  "compilerOptions": {
-    "baseUrl": ".",
-    "jsx": "preserve"
-  }
-}

apps/space/next.config.js

@@ -1,9 +0,0 @@
-/** @type {import('next').NextConfig} */
-
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-};
-
-module.exports = nextConfig;

deploy/heroku/Dockerfile

@@ -1,4 +0,0 @@
-# Deploy the Plane image
-FROM makeplane/plane
-
-LABEL maintainer="engineering@plane.so"

docker-compose-hub.yml

@@ -38,11 +38,12 @@ services:
                 container_name: planefrontend
                 image: makeplane/plane-frontend:latest
                 restart: always
-                command: /usr/local/bin/start.sh
+                command: /usr/local/bin/start.sh apps/app/server.js app
                 env_file:
                         - .env
                 environment:
                         NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
+                        NEXT_PUBLIC_DEPLOY_URL: ${NEXT_PUBLIC_DEPLOY_URL}
                         NEXT_PUBLIC_GOOGLE_CLIENTID: "0"
                         NEXT_PUBLIC_GITHUB_APP_NAME: "0"
                         NEXT_PUBLIC_GITHUB_ID: "0"

docker-compose.yml

@@ -41,12 +41,14 @@ services:
                         dockerfile: ./apps/app/Dockerfile.web
                         args:
                                 NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
+                                NEXT_PUBLIC_DEPLOY_URL: http://localhost/spaces
                 restart: always
-                command: /usr/local/bin/start.sh
+                command: /usr/local/bin/start.sh apps/app/server.js app
                 env_file:
                         - .env
                 environment:
                         NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
+                        NEXT_PUBLIC_DEPLOY_URL: ${NEXT_PUBLIC_DEPLOY_URL}
                         NEXT_PUBLIC_GOOGLE_CLIENTID: "0"
                         NEXT_PUBLIC_GITHUB_APP_NAME: "0"
                         NEXT_PUBLIC_GITHUB_ID: "0"

heroku.yml

@@ -1,3 +0,0 @@
-build:
-  docker:
-    web: deploy/heroku/Dockerfile

nginx/nginx-single-docker-image.conf

@@ -18,6 +18,11 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
     }
+    location /space/ {
+        proxy_pass http://localhost:4000/;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+    }
     error_page   500 502 503 504  /50x.html;
     location = /50x.html {
         root   /usr/share/nginx/html;

package.json

@@ -1,22 +1,16 @@
 {
+  "name": "plane",
   "repository": "https://github.com/makeplane/plane.git",
   "license": "AGPL-3.0",
   "private": true,
   "workspaces": [
-    "apps/*",
+    "web/",
+    "space/",
     "packages/*"
   ],
-  "scripts": {
-    "build": "turbo run build",
-    "dev": "turbo run dev",
-    "start": "turbo run start",
-    "lint": "turbo run lint",
-    "clean": "turbo run clean"
-  },
   "devDependencies": {
     "eslint-config-custom": "*",
-    "prettier": "latest",
-    "turbo": "latest"
+    "prettier": "latest"
   },
   "packageManager": "yarn@1.22.19"
 }

replace-env-vars.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 FROM=$1
 TO=$2
+DIRECTORY=$3
 
 if [ "${FROM}" = "${TO}" ]; then
     echo "Nothing to replace, the value is already set to ${TO}."
@@ -11,4 +12,4 @@ fi
 # Only perform action if $FROM and $TO are different.
 echo "Replacing all statically built instances of $FROM with this string $TO ."
 
-grep -R -la "${FROM}" apps/app/.next | xargs -I{} sed -i "s|$FROM|$TO|g" "{}"
+grep -R -la "${FROM}" apps/$DIRECTORY/.next | xargs -I{} sed -i "s|$FROM|$TO|g" "{}"

setup.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# cp ./.env.example ./.env
+cp ./.env.example ./.env
 
 # Export for tr error in mac
 export LC_ALL=C

space/Dockerfile.legacy

@@ -0,0 +1,70 @@
+FROM node:18-alpine AS builder
+RUN apk add --no-cache libc6-compat
+# Set working directory
+WORKDIR /app
+ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
+
+RUN yarn global add turbo
+COPY . .
+
+RUN turbo prune --scope=space --docker
+
+# Add lockfile and package.json's of isolated subworkspace
+FROM node:18-alpine AS installer
+
+RUN apk add --no-cache libc6-compat
+WORKDIR /app
+ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+
+# First install the dependencies (as they change less often)
+COPY .gitignore .gitignore
+COPY --from=builder /app/out/json/ .
+COPY --from=builder /app/out/yarn.lock ./yarn.lock
+RUN yarn install --network-timeout 500000
+
+# Build the project
+COPY --from=builder /app/out/full/ .
+COPY turbo.json turbo.json
+COPY replace-env-vars.sh /usr/local/bin/
+USER root
+RUN chmod +x /usr/local/bin/replace-env-vars.sh
+
+RUN yarn turbo run build --filter=space
+
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL} space
+
+FROM node:18-alpine AS runner
+WORKDIR /app
+
+# Don't run production as root
+RUN addgroup --system --gid 1001 plane
+RUN adduser --system --uid 1001 captain
+USER captain
+
+COPY --from=installer /app/apps/space/next.config.js .
+COPY --from=installer /app/apps/space/package.json .
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=installer --chown=captain:plane /app/apps/space/.next/standalone ./
+
+COPY --from=installer --chown=captain:plane /app/apps/space/.next ./apps/space/.next
+
+ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
+ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
+    BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL
+
+USER root
+COPY replace-env-vars.sh /usr/local/bin/
+COPY start.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/replace-env-vars.sh
+RUN chmod +x /usr/local/bin/start.sh
+
+USER captain
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+EXPOSE 3000

space/Dockerfile.space

@@ -0,0 +1,56 @@
+FROM node:18-alpine AS base
+
+# Install dependencies only when needed
+FROM base AS deps
+# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
+RUN apk add --no-cache libc6-compat
+WORKDIR /space
+
+# Install dependencies based on the preferred package manager
+COPY package.json yarn.lock* ./
+RUN yarn
+
+
+# Rebuild the source code only when needed
+FROM base AS builder
+WORKDIR /space
+
+COPY . .
+
+COPY --from=deps /space/node_modules ./node_modules
+COPY --from=deps /space/yarn.lock .
+
+ENV NEXT_TELEMETRY_DISABLED 1
+
+RUN yarn build
+
+# If using npm comment out above and use below instead
+# RUN npm run build
+
+# Production image, copy all the files and run next
+FROM base AS runner
+WORKDIR /space
+
+ENV NODE_ENV production
+# Uncomment the following line in case you want to disable telemetry during runtime.
+# ENV NEXT_TELEMETRY_DISABLED 1
+
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+COPY --from=builder /space/public ./public
+
+# Automatically leverage output traces to reduce image size
+# https://nextjs.org/docs/advanced-features/output-file-tracing
+COPY --from=builder --chown=nextjs:nodejs /space/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /space/.next/static ./.next/static
+
+USER nextjs
+
+EXPOSE 3000
+
+ENV PORT 3000
+# set hostname to localhost
+ENV HOSTNAME "0.0.0.0"
+
+CMD ["node", "space/server.js"]

space/app/[workspace_slug]/[project_slug]/page.tsx

@@ -26,7 +26,9 @@ const WorkspaceProjectPage = observer(() => {
 
   const { workspace_slug, project_slug } = routerParams as { workspace_slug: string; project_slug: string };
   const board =
-    routerSearchparams && routerSearchparams.get("board") != null && (routerSearchparams.get("board") as TIssueBoardKeys | "");
+    routerSearchparams &&
+    routerSearchparams.get("board") != null &&
+    (routerSearchparams.get("board") as TIssueBoardKeys | "");
 
   // updating default board view when we are in the issues page
   useEffect(() => {

space/next.config.js

@@ -0,0 +1,14 @@
+/** @type {import('next').NextConfig} */
+const path = require("path");
+
+const nextConfig = {
+  reactStrictMode: false,
+  swcMinify: true,
+  experimental: {
+    outputFileTracingRoot: path.join(__dirname, "../../"),
+    appDir: true,
+  },
+  output: "standalone",
+};
+
+module.exports = nextConfig;

space/package.json

@@ -1,11 +1,11 @@
 {
-  "name": "plane-deploy",
+  "name": "space",
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "next dev -p 4000",
     "build": "next build",
-    "start": "next start",
+    "start": "next start -p 4000",
     "lint": "next lint"
   },
   "dependencies": {

space/services/api.service.ts

@@ -3,14 +3,12 @@ import axios from "axios";
 // js cookie
 import Cookies from "js-cookie";
 
-const base_url: string | null = "https://boarding.plane.so";
-
 abstract class APIService {
   protected baseURL: string;
   protected headers: any = {};
 
-  constructor(baseURL: string) {
-    this.baseURL = base_url ? base_url : baseURL;
+  constructor(_baseURL: string) {
+    this.baseURL = _baseURL;
   }
 
   setRefreshToken(token: string) {

space/services/issue.service.ts

@@ -1,11 +1,9 @@
 // services
 import APIService from "services/api.service";
 
-const { NEXT_PUBLIC_API_BASE_URL } = process.env;
-
 class IssueService extends APIService {
   constructor() {
-    super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
+    super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
   }
 
   async getPublicIssues(workspace_slug: string, project_slug: string): Promise<any> {

space/services/project.service.ts

@@ -1,11 +1,9 @@
 // services
 import APIService from "services/api.service";
 
-const { NEXT_PUBLIC_API_BASE_URL } = process.env;
-
 class ProjectService extends APIService {
   constructor() {
-    super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
+    super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
   }
 
   async getProjectSettingsAsync(workspace_slug: string, project_slug: string): Promise<any> {

space/services/user.service.ts

@@ -1,11 +1,9 @@
 // services
 import APIService from "services/api.service";
 
-const { NEXT_PUBLIC_API_BASE_URL } = process.env;
-
 class UserService extends APIService {
   constructor() {
-    super(NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
+    super(process.env.NEXT_PUBLIC_API_BASE_URL || "http://localhost:8000");
   }
 
   async currentUser(): Promise<any> {

start.sh

@@ -3,7 +3,7 @@ set -x
 
 # Replace the statically built BUILT_NEXT_PUBLIC_API_BASE_URL with run-time NEXT_PUBLIC_API_BASE_URL
 # NOTE: if these values are the same, this will be skipped.
-/usr/local/bin/replace-env-vars.sh "$BUILT_NEXT_PUBLIC_API_BASE_URL" "$NEXT_PUBLIC_API_BASE_URL"
+/usr/local/bin/replace-env-vars.sh "$BUILT_NEXT_PUBLIC_API_BASE_URL" "$NEXT_PUBLIC_API_BASE_URL" $2
 
 echo "Starting Plane Frontend.."
-node apps/app/server.js
+node $1

turbo.json

@@ -1,51 +0,0 @@
-{
-  "$schema": "https://turbo.build/schema.json",
-  "globalEnv": [
-    "NEXT_PUBLIC_GITHUB_ID",
-    "NEXT_PUBLIC_GOOGLE_CLIENTID",
-    "NEXT_PUBLIC_API_BASE_URL",
-    "NEXT_PUBLIC_DEPLOY_URL",
-    "API_BASE_URL",
-    "NEXT_PUBLIC_SENTRY_DSN",
-    "SENTRY_AUTH_TOKEN",
-    "NEXT_PUBLIC_SENTRY_ENVIRONMENT",
-    "NEXT_PUBLIC_GITHUB_APP_NAME",
-    "NEXT_PUBLIC_ENABLE_SENTRY",
-    "NEXT_PUBLIC_ENABLE_OAUTH",
-    "NEXT_PUBLIC_UNSPLASH_ACCESS",
-    "NEXT_PUBLIC_UNSPLASH_ENABLED",
-    "NEXT_PUBLIC_TRACK_EVENTS",
-    "TRACKER_ACCESS_KEY",
-    "NEXT_PUBLIC_CRISP_ID",
-    "NEXT_PUBLIC_ENABLE_SESSION_RECORDER",
-    "NEXT_PUBLIC_SESSION_RECORDER_KEY",
-    "NEXT_PUBLIC_EXTRA_IMAGE_DOMAINS",
-    "NEXT_PUBLIC_SLACK_CLIENT_ID",
-    "NEXT_PUBLIC_SLACK_CLIENT_SECRET",
-    "NEXT_PUBLIC_SUPABASE_URL",
-    "NEXT_PUBLIC_SUPABASE_ANON_KEY",
-    "NEXT_PUBLIC_PLAUSIBLE_DOMAIN"
-  ],
-  "pipeline": {
-    "build": {
-      "dependsOn": ["^build"],
-      "outputs": [".next/**", "dist/**"]
-    },
-    "test": {
-      "dependsOn": ["^build"],
-      "outputs": []
-    },
-    "lint": {
-      "outputs": []
-    },
-    "dev": {
-      "cache": false
-    },
-    "start": {
-      "cache": false
-    },
-    "clean": {
-      "cache": false
-    }
-  }
-}

web/.eslintrc.js

@@ -0,0 +1,16 @@
+module.exports = {
+  extends: ["next", "prettier"],
+  parser: "@typescript-eslint/parser",
+  plugins: ["react", "@typescript-eslint"],
+  rules: {
+    "@next/next/no-html-link-for-pages": "off",
+    "react/jsx-key": "off",
+    "prefer-const": "error",
+    "no-irregular-whitespace": "error",
+    "no-trailing-spaces": "error",
+    "no-duplicate-imports": "error",
+    "arrow-body-style": ["error", "as-needed"],
+    "react/self-closing-comp": ["error", { component: true, html: true }],
+    "@next/next/no-img-element": "off",
+  },
+};