diff --git a/apiserver/Dockerfile b/apiserver/Dockerfile index 967e34c5f..f2aa59e51 100644 --- a/apiserver/Dockerfile +++ b/apiserver/Dockerfile @@ -3,6 +3,7 @@ FROM python:3.8.14-alpine3.16 AS backend # set environment variables ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 +ENV PIP_DISABLE_PIP_VERSION_CHECK=1 WORKDIR /code @@ -12,9 +13,9 @@ RUN apk --update --no-cache add \ "nodejs-current~=18" \ "xmlsec~=1.2" - COPY requirements.txt ./ COPY requirements ./requirements +RUN apk add libffi-dev RUN apk --update --no-cache --virtual .build-deps add \ "bash~=5.1" \ "g++~=11.2" \ @@ -23,6 +24,8 @@ RUN apk --update --no-cache --virtual .build-deps add \ "git~=2" \ "make~=4.3" \ "postgresql13-dev~=13" \ + "libc-dev" \ + "linux-headers" \ && \ pip install -r requirements.txt --compile --no-cache-dir \ && \ diff --git a/bin/takeoff b/apiserver/bin/takeoff similarity index 100% rename from bin/takeoff rename to apiserver/bin/takeoff diff --git a/apiserver/plane/settings/production.py b/apiserver/plane/settings/production.py index ab84c36d5..b7312fb83 100644 --- a/apiserver/plane/settings/production.py +++ b/apiserver/plane/settings/production.py @@ -174,7 +174,7 @@ CACHES = { "LOCATION": REDIS_URL, "OPTIONS": { "CLIENT_CLASS": "django_redis.client.DefaultClient", - "CONNECTION_POOL_KWARGS": {"ssl_cert_reqs": False}, + # "CONNECTION_POOL_KWARGS": {"ssl_cert_reqs": False}, }, } } diff --git a/apps/app/Dockerfile b/apps/app/Dockerfile index 967096ba3..f567f5501 100644 --- a/apps/app/Dockerfile +++ b/apps/app/Dockerfile @@ -15,7 +15,6 @@ COPY ./apps ./apps COPY ./package.json ./package.json COPY ./.eslintrc.json ./.eslintrc.json COPY ./turbo.json ./turbo.json -COPY ./yarn.lock ./yarn.lock COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml COPY ./pnpm-lock.yaml ./pnpm-lock.yaml @@ -45,6 +44,7 @@ RUN pnpm install # Build the project COPY --from=builder /app/out/full/ . COPY turbo.json turbo.json +# RUN pnpm add -g turbo RUN pnpm turbo run build --filter=app... FROM node:alpine AS runner diff --git a/apps/app/package.json b/apps/app/package.json index f2c5186db..ac979ef0f 100644 --- a/apps/app/package.json +++ b/apps/app/package.json @@ -14,6 +14,13 @@ "@lexical/list": "^0.6.4", "@lexical/react": "^0.6.4", "@lexical/utils": "^0.6.4", + "@lexical/rich-text": "^0.6.4", + "@lexical/code": "^0.6.4", + "@lexical/table": "^0.6.4", + "@lexical/link": "^0.6.4", + "@lexical/markdown": "^0.6.4", + "@lexical/html": "^0.6.4", + "@lexical/selection": "^0.6.4", "axios": "^1.1.3", "js-cookie": "^3.0.1", "lexical": "^0.6.4", diff --git a/docker-compose.yml b/docker-compose.yml index 9b85b0481..83e8bc891 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,6 +25,10 @@ services: context: . dockerfile: ./apps/app/Dockerfile restart: always + environment: + NEXT_PUBLIC_GITHUB_ID: $NEXT_PUBLIC_GITHUB_ID + NEXT_PUBLIC_GOOGLE_CLIENTID: $NEXT_PUBLIC_GOOGLE_CLIENTID + NEXT_PUBLIC_API_BASE_URL: $NEXT_PUBLIC_API_BASE_URL ports: - 3000:3000 networks: @@ -48,6 +52,13 @@ services: REDIS_HOST: redis REDIS_PORT: 6379 SECRET_KEY: $SECRET_KEY + AWS_REGION: $AWS_REGION + AWS_ACCESS_KEY_ID: $AWS_ACCESS_KEY_ID + AWS_SECRET_ACCESS_KEY: $AWS_SECRET_ACCESS_KEY + AWS_S3_BUCKET_NAME: $AWS_S3_BUCKET_NAME + EMAIL_HOST: $EMAIL_HOST + EMAIL_HOST_USER: $EMAIL_HOST_USER + EMAIL_HOST_PASSWORD: $EMAIL_HOST_PASSWORD networks: - app_network depends_on: diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9fafc9a74..6779c9081 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,15 +9,22 @@ importers: turbo: latest devDependencies: eslint: 8.28.0 - eslint-config-turbo: 0.0.4_eslint@8.28.0 + eslint-config-turbo: 0.0.7_eslint@8.28.0 turbo: 1.6.3 apps/app: specifiers: '@headlessui/react': ^1.7.3 '@heroicons/react': ^2.0.12 + '@lexical/code': ^0.6.4 + '@lexical/html': ^0.6.4 + '@lexical/link': ^0.6.4 '@lexical/list': ^0.6.4 + '@lexical/markdown': ^0.6.4 '@lexical/react': ^0.6.4 + '@lexical/rich-text': ^0.6.4 + '@lexical/selection': ^0.6.4 + '@lexical/table': ^0.6.4 '@lexical/utils': ^0.6.4 '@types/js-cookie': ^3.0.2 '@types/lodash': ^4.14.188 @@ -54,8 +61,15 @@ importers: dependencies: '@headlessui/react': 1.7.4_biqbaboplfbrettd7655fr4n2y '@heroicons/react': 2.0.13_react@18.2.0 + '@lexical/code': 0.6.4_lexical@0.6.4 + '@lexical/html': 0.6.4_lexical@0.6.4 + '@lexical/link': 0.6.4_lexical@0.6.4 '@lexical/list': 0.6.4_lexical@0.6.4 + '@lexical/markdown': 0.6.4_bxsdi55v3sssedk76lbl4oc7vi '@lexical/react': 0.6.4_kpr2eqve2cw3wrreahgz2ip7ja + '@lexical/rich-text': 0.6.4_57tb3ip3heyjq7opzdlcjoitia + '@lexical/selection': 0.6.4_lexical@0.6.4 + '@lexical/table': 0.6.4_lexical@0.6.4 '@lexical/utils': 0.6.4_lexical@0.6.4 axios: 1.2.0 js-cookie: 3.0.1 @@ -267,6 +281,23 @@ packages: lexical: 0.6.4 dev: false + /@lexical/markdown/0.6.4_bxsdi55v3sssedk76lbl4oc7vi: + resolution: {integrity: sha512-9kg+BsP4ePCztrK7UYW8a+8ad1/h/OLziJkMZkl3YAkfhJudkHoj4ljCTJZcLuXHtVXmvLZhyGZktitcJImnOg==} + peerDependencies: + lexical: 0.6.4 + dependencies: + '@lexical/code': 0.6.4_lexical@0.6.4 + '@lexical/link': 0.6.4_lexical@0.6.4 + '@lexical/list': 0.6.4_lexical@0.6.4 + '@lexical/rich-text': 0.6.4_57tb3ip3heyjq7opzdlcjoitia + '@lexical/text': 0.6.4_lexical@0.6.4 + '@lexical/utils': 0.6.4_lexical@0.6.4 + lexical: 0.6.4 + transitivePeerDependencies: + - '@lexical/clipboard' + - '@lexical/selection' + dev: false + /@lexical/markdown/0.6.4_dlxdgdmlaurtixklkqcbpqk7be: resolution: {integrity: sha512-9kg+BsP4ePCztrK7UYW8a+8ad1/h/OLziJkMZkl3YAkfhJudkHoj4ljCTJZcLuXHtVXmvLZhyGZktitcJImnOg==} peerDependencies: @@ -346,6 +377,19 @@ packages: - yjs dev: false + /@lexical/rich-text/0.6.4_57tb3ip3heyjq7opzdlcjoitia: + resolution: {integrity: sha512-GUTAEUPmSKzL1kldvdHqM9IgiAJC1qfMeDQFyUS2xwWKQnid0nVeUZXNxyBwxZLyOcyDkx5dXp9YiEO6X4x+TQ==} + peerDependencies: + '@lexical/clipboard': 0.6.4 + '@lexical/selection': 0.6.4 + '@lexical/utils': 0.6.4 + lexical: 0.6.4 + dependencies: + '@lexical/selection': 0.6.4_lexical@0.6.4 + '@lexical/utils': 0.6.4_lexical@0.6.4 + lexical: 0.6.4 + dev: false + /@lexical/rich-text/0.6.4_jxqtqauh5scnexlu66czmxsxkq: resolution: {integrity: sha512-GUTAEUPmSKzL1kldvdHqM9IgiAJC1qfMeDQFyUS2xwWKQnid0nVeUZXNxyBwxZLyOcyDkx5dXp9YiEO6X4x+TQ==} peerDependencies: @@ -1193,13 +1237,13 @@ packages: - supports-color dev: true - /eslint-config-turbo/0.0.4_eslint@8.28.0: - resolution: {integrity: sha512-HErPS/wfWkSdV9Yd2dDkhZt3W2B78Ih/aWPFfaHmCMjzPalh+5KxRRGTf8MOBQLCebcWJX0lP1Zvc1rZIHlXGg==} + /eslint-config-turbo/0.0.7_eslint@8.28.0: + resolution: {integrity: sha512-WbrGlyfs94rOXrhombi1wjIAYGdV2iosgJRndOZtmDQeq5GLTzYmBUCJQZWtLBEBUPCj96RxZ2OL7Cn+xv/Azg==} peerDependencies: - eslint: ^7.23.0 || ^8.0.0 + eslint: '>6.6.0' dependencies: eslint: 8.28.0 - eslint-plugin-turbo: 0.0.4_eslint@8.28.0 + eslint-plugin-turbo: 0.0.7_eslint@8.28.0 dev: true /eslint-import-resolver-node/0.3.6: @@ -1345,10 +1389,10 @@ packages: string.prototype.matchall: 4.0.8 dev: true - /eslint-plugin-turbo/0.0.4_eslint@8.28.0: - resolution: {integrity: sha512-dfmYE/iPvoJInQq+5E/0mj140y/rYwKtzZkn3uVK8+nvwC5zmWKQ6ehMWrL4bYBkGzSgpOndZM+jOXhPQ2m8Cg==} + /eslint-plugin-turbo/0.0.7_eslint@8.28.0: + resolution: {integrity: sha512-iajOH8eD4jha3duztGVBD1BEmvNrQBaA/y3HFHf91vMDRYRwH7BpHSDFtxydDpk5ghlhRxG299SFxz7D6z4MBQ==} peerDependencies: - eslint: ^7.23.0 || ^8.0.0 + eslint: '>6.6.0' dependencies: eslint: 8.28.0 dev: true