github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

dev: updated dockerfile.space and start and replace script

Browse Source
This commit is contained in:
NarayanBavisetti 2023-08-21 17:11:24 +05:30
parent f385b762af
commit 4ae34f37b8
10 changed files with 84 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app/Dockerfile.web
View File

@ -33,8 +33,8 @@ RUN yarn turbo run build --filter=app
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}
ENV NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL}
RUN /usr/local/bin/replace-env-vars.sh http://NEXT_PUBLIC_WEBAPP_URL_PLACEHOLDER ${NEXT_PUBLIC_API_BASE_URL} app
FROM node:18-alpine AS runner
WORKDIR /app

22
apps/app/components/tiptap/bubble-menu/index.tsx
View File

@ -15,36 +15,36 @@ export interface BubbleMenuItem {
type EditorBubbleMenuProps = Omit<BubbleMenuProps, "children">;
export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props) => {
export const EditorBubbleMenu: FC<EditorBubbleMenuProps> = (props: any) => {
const items: BubbleMenuItem[] = [
{
name: "bold",
isActive: () => props.editor!.isActive("bold"),
command: () => props.editor!.chain().focus().toggleBold().run(),
isActive: () => props.editor?.isActive("bold"),
command: () => props.editor?.chain().focus().toggleBold().run(),
icon: BoldIcon,
},
{
name: "italic",
isActive: () => props.editor!.isActive("italic"),
command: () => props.editor!.chain().focus().toggleItalic().run(),
isActive: () => props.editor?.isActive("italic"),
command: () => props.editor?.chain().focus().toggleItalic().run(),
icon: ItalicIcon,
},
{
name: "underline",
isActive: () => props.editor!.isActive("underline"),
command: () => props.editor!.chain().focus().toggleUnderline().run(),
isActive: () => props.editor?.isActive("underline"),
command: () => props.editor?.chain().focus().toggleUnderline().run(),
icon: UnderlineIcon,
},
{
name: "strike",
isActive: () => props.editor!.isActive("strike"),
command: () => props.editor!.chain().focus().toggleStrike().run(),
isActive: () => props.editor?.isActive("strike"),
command: () => props.editor?.chain().focus().toggleStrike().run(),
icon: StrikethroughIcon,
},
{
name: "code",
isActive: () => props.editor!.isActive("code"),
command: () => props.editor!.chain().focus().toggleCode().run(),
isActive: () => props.editor?.isActive("code"),
command: () => props.editor?.chain().focus().toggleCode().run(),
icon: CodeIcon,
},
];

75
apps/space/Dockerfile.space
View File

@ -1,63 +1,70 @@
FROM node:18-alpine AS base
# [Stage 1] Prune the plane-deploy Project and lockfile out the monorepo.
FROM base AS builder
FROM node:18-alpine AS builder
RUN apk add --no-cache libc6-compat
RUN apk update
# Installing turbo, copying monorepo and executing prune
# Set working directory
WORKDIR /app
ENV NEXT_PUBLIC_API_BASE_URL=http://NEXT_PUBLIC_API_BASE_URL_PLACEHOLDER
RUN yarn global add turbo
COPY . .
# plane-deploy pruned as /app/out/json (deps) and /app/out/full (plane-deploy)
RUN turbo prune --scope=plane-deploy --docker
RUN turbo prune --scope=space --docker
# Add lockfile and package.json's of isolated subworkspace
FROM node:18-alpine AS installer
# [Stage 2] Install Dependencies from deps only files from /app/out/json
FROM base AS installer
RUN apk add --no-cache libc6-compat
RUN apk add tree
RUN apk update
WORKDIR /app
ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
# Copying package.json and lockfile from plane-deploy and also from root, as /app/out/yarn-lock.json and /app/out/json
# 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
RUN yarn install --network-timeout 500000
# Building the Project with standalone mode ( https://nextjs.org/docs/pages/api-reference/next-config-js/output )
COPY --from=builder ./app/out/full .
RUN yarn turbo run build --filter=plane-deploy
# CMD tree ./apps -I 'node_modules'
# 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
# [Stage: 3] Running the project
FROM base AS runner
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
# Creating user group for production, plane as usergroup and captain as user
# Don't run production as root
RUN addgroup --system --gid 1001 plane
RUN adduser --system --uid 1001 captain
USER captain
# transporting package files from installer
COPY --from=installer /app/apps/space/next.config.js .
COPY --from=installer /app/apps/space/package.json .
# transporting builds from installer
# 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
# Start the server
CMD node apps/space/server.js
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

14
apps/space/app/[workspace_slug]/page.tsx
View File

@ -1,7 +1,17 @@
"use client";
const WorkspaceProjectPage = () => (
<div className="relative w-screen h-screen flex justify-center items-center text-5xl">Plane Workspace Space</div>
// next imports
import { useRouter, useParams, useSearchParams } from "next/navigation";
const WorkspaceProjectPage = () => {
const routerParams = useParams();
const { workspace_slug } = routerParams as { workspace_slug: string };
return (
<div className="relative w-screen h-screen flex justify-center items-center text-5xl">
Plane {workspace_slug || "nahh"}
</div>
);
};
export default WorkspaceProjectPage;

2
apps/space/package.json
View File

@ -1,5 +1,5 @@
{
"name": "plane-deploy",
"name": "space",
"version": "0.0.1",
"private": true,
"scripts": {

12
docker-compose.yml
View File

@ -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"
@ -58,13 +60,15 @@ services:
depends_on:
- plane-api
- plane-worker
public-deploy:
container_name: planepublicdeploy
plane-deploy:
container_name: planedeploy
build:
context: .
dockerfile: ./apps/space/Dockerfile.space
args:
NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
restart: always
command: node apps/space/server.js
command: /usr/local/bin/start.sh apps/space/server.js space
env_file:
- .env
environment:

4
nginx/nginx.conf.template
View File

@ -15,8 +15,8 @@ server {
proxy_pass http://planefrontend:3000/;
}
location /spaces {
proxy_pass http://planepublicdeploy:4000/;
location /spaces/ {
proxy_pass http://planedeploy:3000/;
}
location /api/ {

3
replace-env-vars.sh
View File

@ -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" "{}"

2
setup.sh
View File

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

4
start.sh
View File

@ -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 apps/space/server.js
node $1