Skip to content

Commit c76af7d

Browse files
sriramveeraghantasriramveeraghanta
authored
Merge pull request #4688 from makeplane/preview
release: v0.21-dev
2 parents 1dcea9b + 97eea75 commit c76af7d

File tree

350 files changed

+7180
-2782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+7180
-2782
lines changed

‎.github/workflows/build-aio-base.yml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
name: Build AIO Base Image
2+
3+
on:
4+
workflow_dispatch:
5+
6+
env:
7+
TARGET_BRANCH: ${{ github.ref_name }}
8+
9+
jobs:
10+
base_build_setup:
11+
name: Build Preparation
12+
runs-on: ubuntu-latest
13+
outputs:
14+
gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
15+
gh_buildx_driver: ${{ steps.set_env_variables.outputs.BUILDX_DRIVER }}
16+
gh_buildx_version: ${{ steps.set_env_variables.outputs.BUILDX_VERSION }}
17+
gh_buildx_platforms: ${{ steps.set_env_variables.outputs.BUILDX_PLATFORMS }}
18+
gh_buildx_endpoint: ${{ steps.set_env_variables.outputs.BUILDX_ENDPOINT }}
19+
build_base: ${{ steps.changed_files.outputs.base_any_changed }}
20+
21+
steps:
22+
- id: set_env_variables
23+
name: Set Environment Variables
24+
run: |
25+
echo "BUILDX_DRIVER=cloud" >> $GITHUB_OUTPUT
26+
echo "BUILDX_VERSION=lab:latest" >> $GITHUB_OUTPUT
27+
echo "BUILDX_PLATFORMS=linux/amd64,linux/arm64" >> $GITHUB_OUTPUT
28+
echo "BUILDX_ENDPOINT=makeplane/plane-dev" >> $GITHUB_OUTPUT
29+
echo "TARGET_BRANCH=${{ env.TARGET_BRANCH }}" >> $GITHUB_OUTPUT
30+
31+
- id: checkout_files
32+
name: Checkout Files
33+
uses: actions/checkout@v4
34+
35+
- name: Get changed files
36+
id: changed_files
37+
uses: tj-actions/changed-files@v42
38+
with:
39+
files_yaml: |
40+
base:
41+
- aio/Dockerfile.base
42+
43+
base_build_push:
44+
if: ${{ needs.base_build_setup.outputs.build_base == 'true' || github.event_name == 'workflow_dispatch' || needs.base_build_setup.outputs.gh_branch_name == 'master' }}
45+
runs-on: ubuntu-latest
46+
needs: [base_build_setup]
47+
env:
48+
BASE_IMG_TAG: makeplane/plane-aio-base:${{ needs.base_build_setup.outputs.gh_branch_name }}
49+
TARGET_BRANCH: ${{ needs.base_build_setup.outputs.gh_branch_name }}
50+
BUILDX_DRIVER: ${{ needs.base_build_setup.outputs.gh_buildx_driver }}
51+
BUILDX_VERSION: ${{ needs.base_build_setup.outputs.gh_buildx_version }}
52+
BUILDX_PLATFORMS: ${{ needs.base_build_setup.outputs.gh_buildx_platforms }}
53+
BUILDX_ENDPOINT: ${{ needs.base_build_setup.outputs.gh_buildx_endpoint }}
54+
steps:
55+
- name: Check out the repo
56+
uses: actions/checkout@v4
57+
58+
- name: Set Docker Tag
59+
run: |
60+
if [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
61+
TAG=makeplane/plane-aio-base:latest
62+
else
63+
TAG=${{ env.BASE_IMG_TAG }}
64+
fi
65+
echo "BASE_IMG_TAG=${TAG}" >> $GITHUB_ENV
66+
67+
- name: Login to Docker Hub
68+
uses: docker/login-action@v3
69+
with:
70+
username: ${{ secrets.DOCKERHUB_USERNAME }}
71+
password: ${{ secrets.DOCKERHUB_TOKEN }}
72+
73+
- name: Set up Docker Buildx
74+
uses: docker/setup-buildx-action@v3
75+
with:
76+
driver: ${{ env.BUILDX_DRIVER }}
77+
version: ${{ env.BUILDX_VERSION }}
78+
endpoint: ${{ env.BUILDX_ENDPOINT }}
79+
80+
- name: Build and Push to Docker Hub
81+
uses: docker/build-push-action@v5.1.0
82+
with:
83+
context: ./aio
84+
file: ./aio/Dockerfile.base
85+
platforms: ${{ env.BUILDX_PLATFORMS }}
86+
tags: ${{ env.BASE_IMG_TAG }}
87+
push: true
88+
env:
89+
DOCKER_BUILDKIT: 1
90+
DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
91+
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/build-branch.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414

1515
jobs:
1616
branch_build_setup:
17-
name: Build-Push Web/Space/API/Proxy Docker Image
17+
name: Build Setup
1818
runs-on: ubuntu-latest
1919
outputs:
2020
gh_branch_name: ${{ steps.set_env_variables.outputs.TARGET_BRANCH }}
@@ -85,7 +85,7 @@ jobs:
8585
runs-on: ubuntu-20.04
8686
needs: [branch_build_setup]
8787
env:
88-
FRONTEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
88+
FRONTEND_TAG: makeplane/plane-frontend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
8989
TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
9090
BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
9191
BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -95,9 +95,9 @@ jobs:
9595
- name: Set Frontend Docker Tag
9696
run: |
9797
if [ "${{ github.event_name }}" == "release" ]; then
98-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:${{ github.event.release.tag_name }}
98+
TAG=makeplane/plane-frontend:stable,makeplane/plane-frontend:${{ github.event.release.tag_name }}
9999
elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
100-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-frontend:latest
100+
TAG=makeplane/plane-frontend:latest
101101
else
102102
TAG=${{ env.FRONTEND_TAG }}
103103
fi
@@ -137,7 +137,7 @@ jobs:
137137
runs-on: ubuntu-20.04
138138
needs: [branch_build_setup]
139139
env:
140-
ADMIN_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-admin:${{ needs.branch_build_setup.outputs.gh_branch_name }}
140+
ADMIN_TAG: makeplane/plane-admin:${{ needs.branch_build_setup.outputs.gh_branch_name }}
141141
TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
142142
BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
143143
BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -147,9 +147,9 @@ jobs:
147147
- name: Set Admin Docker Tag
148148
run: |
149149
if [ "${{ github.event_name }}" == "release" ]; then
150-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-admin:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-admin:${{ github.event.release.tag_name }}
150+
TAG=makeplane/plane-admin:stable,makeplane/plane-admin:${{ github.event.release.tag_name }}
151151
elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
152-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-admin:latest
152+
TAG=makeplane/plane-admin:latest
153153
else
154154
TAG=${{ env.ADMIN_TAG }}
155155
fi
@@ -189,7 +189,7 @@ jobs:
189189
runs-on: ubuntu-20.04
190190
needs: [branch_build_setup]
191191
env:
192-
SPACE_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-space:${{ needs.branch_build_setup.outputs.gh_branch_name }}
192+
SPACE_TAG: makeplane/plane-space:${{ needs.branch_build_setup.outputs.gh_branch_name }}
193193
TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
194194
BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
195195
BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -199,9 +199,9 @@ jobs:
199199
- name: Set Space Docker Tag
200200
run: |
201201
if [ "${{ github.event_name }}" == "release" ]; then
202-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-space:${{ github.event.release.tag_name }}
202+
TAG=makeplane/plane-space:stable,makeplane/plane-space:${{ github.event.release.tag_name }}
203203
elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
204-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-space:latest
204+
TAG=makeplane/plane-space:latest
205205
else
206206
TAG=${{ env.SPACE_TAG }}
207207
fi
@@ -241,7 +241,7 @@ jobs:
241241
runs-on: ubuntu-20.04
242242
needs: [branch_build_setup]
243243
env:
244-
BACKEND_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
244+
BACKEND_TAG: makeplane/plane-backend:${{ needs.branch_build_setup.outputs.gh_branch_name }}
245245
TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
246246
BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
247247
BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -251,9 +251,9 @@ jobs:
251251
- name: Set Backend Docker Tag
252252
run: |
253253
if [ "${{ github.event_name }}" == "release" ]; then
254-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:${{ github.event.release.tag_name }}
254+
TAG=makeplane/plane-backend:stable,makeplane/plane-backend:${{ github.event.release.tag_name }}
255255
elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
256-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-backend:latest
256+
TAG=makeplane/plane-backend:latest
257257
else
258258
TAG=${{ env.BACKEND_TAG }}
259259
fi
@@ -293,7 +293,7 @@ jobs:
293293
runs-on: ubuntu-20.04
294294
needs: [branch_build_setup]
295295
env:
296-
PROXY_TAG: ${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:${{ needs.branch_build_setup.outputs.gh_branch_name }}
296+
PROXY_TAG: makeplane/plane-proxy:${{ needs.branch_build_setup.outputs.gh_branch_name }}
297297
TARGET_BRANCH: ${{ needs.branch_build_setup.outputs.gh_branch_name }}
298298
BUILDX_DRIVER: ${{ needs.branch_build_setup.outputs.gh_buildx_driver }}
299299
BUILDX_VERSION: ${{ needs.branch_build_setup.outputs.gh_buildx_version }}
@@ -303,9 +303,9 @@ jobs:
303303
- name: Set Proxy Docker Tag
304304
run: |
305305
if [ "${{ github.event_name }}" == "release" ]; then
306-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:stable,${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:${{ github.event.release.tag_name }}
306+
TAG=makeplane/plane-proxy:stable,makeplane/plane-proxy:${{ github.event.release.tag_name }}
307307
elif [ "${{ env.TARGET_BRANCH }}" == "master" ]; then
308-
TAG=${{ secrets.DOCKERHUB_USERNAME }}/plane-proxy:latest
308+
TAG=makeplane/plane-proxy:latest
309309
else
310310
TAG=${{ env.PROXY_TAG }}
311311
fi

‎Dockerfile

Lines changed: 0 additions & 124 deletions
This file was deleted.

‎admin/app/ai/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ const InstanceAIPage = observer(() => {
1919
return (
2020
<>
2121
<PageHeader title="Artificial Intelligence - God Mode" />
22-
<div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
23-
<div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
22+
<div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
23+
<div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
2424
<div className="text-xl font-medium text-custom-text-100">AI features for all your workspaces</div>
2525
<div className="text-sm font-normal text-custom-text-300">
2626
Configure your AI API credentials so Plane AI features are turned on for all your workspaces.
2727
</div>
2828
</div>
29-
<div className="flex-grow overflow-hidden overflow-y-auto">
29+
<div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md px-4">
3030
{formattedConfig ? (
3131
<InstanceAIForm config={formattedConfig} />
3232
) : (

‎admin/app/authentication/github/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ const InstanceGithubAuthenticationPage = observer(() => {
6464
return (
6565
<>
6666
<PageHeader title="Authentication - God Mode" />
67-
<div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
68-
<div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
67+
<div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
68+
<div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
6969
<AuthenticationMethodCard
7070
name="Github"
7171
description="Allow members to login or sign up to plane with their Github accounts."
@@ -93,7 +93,7 @@ const InstanceGithubAuthenticationPage = observer(() => {
9393
withBorder={false}
9494
/>
9595
</div>
96-
<div className="flex-grow overflow-hidden overflow-y-auto">
96+
<div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md p-4">
9797
{formattedConfig ? (
9898
<InstanceGithubConfigForm config={formattedConfig} />
9999
) : (

‎admin/app/authentication/google/page.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ const InstanceGoogleAuthenticationPage = observer(() => {
5858
return (
5959
<>
6060
<PageHeader title="Authentication - God Mode" />
61-
<div className="relative container mx-auto w-full h-full p-8 py-4 space-y-6 flex flex-col">
62-
<div className="border-b border-custom-border-100 pb-3 space-y-1 flex-shrink-0">
61+
<div className="relative container mx-auto w-full h-full p-4 py-4 space-y-6 flex flex-col">
62+
<div className="border-b border-custom-border-100 mx-4 py-4 space-y-1 flex-shrink-0">
6363
<AuthenticationMethodCard
6464
name="Google"
6565
description="Allow members to login or sign up to plane with their Google
@@ -81,7 +81,7 @@ const InstanceGoogleAuthenticationPage = observer(() => {
8181
withBorder={false}
8282
/>
8383
</div>
84-
<div className="flex-grow overflow-hidden overflow-y-auto">
84+
<div className="flex-grow overflow-hidden overflow-y-scroll vertical-scrollbar scrollbar-md p-4">
8585
{formattedConfig ? (
8686
<InstanceGoogleConfigForm config={formattedConfig} />
8787
) : (

0 commit comments

Comments
 (0)