From 83c5e11a615bb3c72f1edb5d5988707213f90751 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Sun, 25 Jul 2021 20:45:15 +0200 Subject: [PATCH] wip --- .gitignore | 4 +--- __pycache__/gunicorn.conf.cpython-37.pyc | Bin 0 -> 331 bytes .flake8 => backend/.flake8 | 0 backend/.gitignore | 2 ++ backend/Dockerfile | 17 +++++++++++++++++ backend/cloudbuild.yaml | 12 ++++++++++++ manage.py => backend/manage.py | 0 poetry.lock => backend/poetry.lock | 0 pyproject.toml => backend/pyproject.toml | 0 {tabby => backend/tabby}/__init__.py | 0 {tabby => backend/tabby}/app/__init__.py | 0 {tabby => backend/tabby}/app/admin.py | 0 {tabby => backend/tabby}/app/api.py | 0 {tabby => backend/tabby}/app/apps.py | 0 {tabby => backend/tabby}/app/consumers.py | 0 .../tabby}/app/management/__init__.py | 0 .../tabby}/app/management/commands/__init__.py | 0 .../app/management/commands/add_version.py | 0 .../tabby}/app/migrations/0001_initial.py | 0 .../tabby}/app/migrations/0002_gateway.py | 0 .../app/migrations/0003_auto_20210711_1855.py | 0 .../tabby}/app/migrations/0004_sync_token.py | 0 .../app/migrations/0005_user_force_pro.py | 0 .../tabby}/app/migrations/0006_config_name.py | 0 .../tabby}/app/migrations/__init__.py | 0 {tabby => backend/tabby}/app/models.py | 0 {tabby => backend/tabby}/app/sponsors.py | 0 {tabby => backend/tabby}/app/tests.py | 0 {tabby => backend/tabby}/app/urls.py | 0 {tabby => backend/tabby}/app/views.py | 0 {tabby => backend/tabby}/asgi.py | 0 {tabby => backend/tabby}/middleware.py | 0 {tabby => backend/tabby}/settings.py | 0 {tabby => backend/tabby}/urls.py | 0 {tabby => backend/tabby}/wsgi.py | 0 frontend/Dockerfile | 1 + frontend/cloudbuild.yaml | 6 ++++-- 37 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 __pycache__/gunicorn.conf.cpython-37.pyc rename .flake8 => backend/.flake8 (100%) create mode 100644 backend/.gitignore create mode 100644 backend/Dockerfile create mode 100644 backend/cloudbuild.yaml rename manage.py => backend/manage.py (100%) rename poetry.lock => backend/poetry.lock (100%) rename pyproject.toml => backend/pyproject.toml (100%) rename {tabby => backend/tabby}/__init__.py (100%) rename {tabby => backend/tabby}/app/__init__.py (100%) rename {tabby => backend/tabby}/app/admin.py (100%) rename {tabby => backend/tabby}/app/api.py (100%) rename {tabby => backend/tabby}/app/apps.py (100%) rename {tabby => backend/tabby}/app/consumers.py (100%) rename {tabby => backend/tabby}/app/management/__init__.py (100%) rename {tabby => backend/tabby}/app/management/commands/__init__.py (100%) rename {tabby => backend/tabby}/app/management/commands/add_version.py (100%) rename {tabby => backend/tabby}/app/migrations/0001_initial.py (100%) rename {tabby => backend/tabby}/app/migrations/0002_gateway.py (100%) rename {tabby => backend/tabby}/app/migrations/0003_auto_20210711_1855.py (100%) rename {tabby => backend/tabby}/app/migrations/0004_sync_token.py (100%) rename {tabby => backend/tabby}/app/migrations/0005_user_force_pro.py (100%) rename {tabby => backend/tabby}/app/migrations/0006_config_name.py (100%) rename {tabby => backend/tabby}/app/migrations/__init__.py (100%) rename {tabby => backend/tabby}/app/models.py (100%) rename {tabby => backend/tabby}/app/sponsors.py (100%) rename {tabby => backend/tabby}/app/tests.py (100%) rename {tabby => backend/tabby}/app/urls.py (100%) rename {tabby => backend/tabby}/app/views.py (100%) rename {tabby => backend/tabby}/asgi.py (100%) rename {tabby => backend/tabby}/middleware.py (100%) rename {tabby => backend/tabby}/settings.py (100%) rename {tabby => backend/tabby}/urls.py (100%) rename {tabby => backend/tabby}/wsgi.py (100%) diff --git a/.gitignore b/.gitignore index f0ae2db..02344f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ -__pycache__ .vscode .env -.mypy_cache app-dist -db.sqlite3 +.mypy_cache diff --git a/__pycache__/gunicorn.conf.cpython-37.pyc b/__pycache__/gunicorn.conf.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1d95b7aae86478421722efb2f48cd26892d03c84 GIT binary patch literal 331 zcmYjNJx{|h5OqG>plo=@-YW;Qz_81L(!#}9lzd-4|^HrH789Dx%`xJNziQ=bPkzzTUtCwxMu ze0oRb(eAWiMX^npt;7YZYbi?B2(9)pe&3z7FQU{&rJXiUU~IY^`NKf(#aBSco}==1 z9=W)~89B~y(LwH#vB^uxtaZn=0jU`uG_eK6S3-hIHtaPw@Z5rJtULM7^0jChFmJ^4 z3lH$U$d(qZWYAWiAnUDU!w!oMimYnY=(yBsmDXDqUv4ySC0zA~u?a%x9nufIUn2Bm Aga7~l literal 0 HcmV?d00001 diff --git a/.flake8 b/backend/.flake8 similarity index 100% rename from .flake8 rename to backend/.flake8 diff --git a/backend/.gitignore b/backend/.gitignore new file mode 100644 index 0000000..19418ac --- /dev/null +++ b/backend/.gitignore @@ -0,0 +1,2 @@ +__pycache__ +db.sqlite3 diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 0000000..80485a7 --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,17 @@ +# syntax=docker/dockerfile:1 +FROM node:12-alpine AS build +WORKDIR /app +COPY package.json yarn.lock ./ +RUN yarn +COPY webpack* tsconfig.json ./ +COPY src src +RUN yarn run build +RUN yarn run build:server + +FROM node:12-alpine AS package +WORKDIR /app +COPY --from=0 /app/build build +COPY --from=0 /app/build-server build-server +COPY package.json . + +CMD ["npm", "start"] diff --git a/backend/cloudbuild.yaml b/backend/cloudbuild.yaml new file mode 100644 index 0000000..8c8a993 --- /dev/null +++ b/backend/cloudbuild.yaml @@ -0,0 +1,12 @@ +steps: +- name: 'gcr.io/cloud-builders/docker' + dir: 'backend' + args: + - build + - '-t' + - '${_DOCKER_PUBLISH_URL}' + - '--cache-from' + - '${_DOCKER_PUBLISH_URL}' + - '--build-arg' + - 'BACKEND_URL=${_BACKEND_URL}' + - '.' diff --git a/manage.py b/backend/manage.py similarity index 100% rename from manage.py rename to backend/manage.py diff --git a/poetry.lock b/backend/poetry.lock similarity index 100% rename from poetry.lock rename to backend/poetry.lock diff --git a/pyproject.toml b/backend/pyproject.toml similarity index 100% rename from pyproject.toml rename to backend/pyproject.toml diff --git a/tabby/__init__.py b/backend/tabby/__init__.py similarity index 100% rename from tabby/__init__.py rename to backend/tabby/__init__.py diff --git a/tabby/app/__init__.py b/backend/tabby/app/__init__.py similarity index 100% rename from tabby/app/__init__.py rename to backend/tabby/app/__init__.py diff --git a/tabby/app/admin.py b/backend/tabby/app/admin.py similarity index 100% rename from tabby/app/admin.py rename to backend/tabby/app/admin.py diff --git a/tabby/app/api.py b/backend/tabby/app/api.py similarity index 100% rename from tabby/app/api.py rename to backend/tabby/app/api.py diff --git a/tabby/app/apps.py b/backend/tabby/app/apps.py similarity index 100% rename from tabby/app/apps.py rename to backend/tabby/app/apps.py diff --git a/tabby/app/consumers.py b/backend/tabby/app/consumers.py similarity index 100% rename from tabby/app/consumers.py rename to backend/tabby/app/consumers.py diff --git a/tabby/app/management/__init__.py b/backend/tabby/app/management/__init__.py similarity index 100% rename from tabby/app/management/__init__.py rename to backend/tabby/app/management/__init__.py diff --git a/tabby/app/management/commands/__init__.py b/backend/tabby/app/management/commands/__init__.py similarity index 100% rename from tabby/app/management/commands/__init__.py rename to backend/tabby/app/management/commands/__init__.py diff --git a/tabby/app/management/commands/add_version.py b/backend/tabby/app/management/commands/add_version.py similarity index 100% rename from tabby/app/management/commands/add_version.py rename to backend/tabby/app/management/commands/add_version.py diff --git a/tabby/app/migrations/0001_initial.py b/backend/tabby/app/migrations/0001_initial.py similarity index 100% rename from tabby/app/migrations/0001_initial.py rename to backend/tabby/app/migrations/0001_initial.py diff --git a/tabby/app/migrations/0002_gateway.py b/backend/tabby/app/migrations/0002_gateway.py similarity index 100% rename from tabby/app/migrations/0002_gateway.py rename to backend/tabby/app/migrations/0002_gateway.py diff --git a/tabby/app/migrations/0003_auto_20210711_1855.py b/backend/tabby/app/migrations/0003_auto_20210711_1855.py similarity index 100% rename from tabby/app/migrations/0003_auto_20210711_1855.py rename to backend/tabby/app/migrations/0003_auto_20210711_1855.py diff --git a/tabby/app/migrations/0004_sync_token.py b/backend/tabby/app/migrations/0004_sync_token.py similarity index 100% rename from tabby/app/migrations/0004_sync_token.py rename to backend/tabby/app/migrations/0004_sync_token.py diff --git a/tabby/app/migrations/0005_user_force_pro.py b/backend/tabby/app/migrations/0005_user_force_pro.py similarity index 100% rename from tabby/app/migrations/0005_user_force_pro.py rename to backend/tabby/app/migrations/0005_user_force_pro.py diff --git a/tabby/app/migrations/0006_config_name.py b/backend/tabby/app/migrations/0006_config_name.py similarity index 100% rename from tabby/app/migrations/0006_config_name.py rename to backend/tabby/app/migrations/0006_config_name.py diff --git a/tabby/app/migrations/__init__.py b/backend/tabby/app/migrations/__init__.py similarity index 100% rename from tabby/app/migrations/__init__.py rename to backend/tabby/app/migrations/__init__.py diff --git a/tabby/app/models.py b/backend/tabby/app/models.py similarity index 100% rename from tabby/app/models.py rename to backend/tabby/app/models.py diff --git a/tabby/app/sponsors.py b/backend/tabby/app/sponsors.py similarity index 100% rename from tabby/app/sponsors.py rename to backend/tabby/app/sponsors.py diff --git a/tabby/app/tests.py b/backend/tabby/app/tests.py similarity index 100% rename from tabby/app/tests.py rename to backend/tabby/app/tests.py diff --git a/tabby/app/urls.py b/backend/tabby/app/urls.py similarity index 100% rename from tabby/app/urls.py rename to backend/tabby/app/urls.py diff --git a/tabby/app/views.py b/backend/tabby/app/views.py similarity index 100% rename from tabby/app/views.py rename to backend/tabby/app/views.py diff --git a/tabby/asgi.py b/backend/tabby/asgi.py similarity index 100% rename from tabby/asgi.py rename to backend/tabby/asgi.py diff --git a/tabby/middleware.py b/backend/tabby/middleware.py similarity index 100% rename from tabby/middleware.py rename to backend/tabby/middleware.py diff --git a/tabby/settings.py b/backend/tabby/settings.py similarity index 100% rename from tabby/settings.py rename to backend/tabby/settings.py diff --git a/tabby/urls.py b/backend/tabby/urls.py similarity index 100% rename from tabby/urls.py rename to backend/tabby/urls.py diff --git a/tabby/wsgi.py b/backend/tabby/wsgi.py similarity index 100% rename from tabby/wsgi.py rename to backend/tabby/wsgi.py diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 80485a7..ff14289 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 FROM node:12-alpine AS build +ARG BACKEND_URL WORKDIR /app COPY package.json yarn.lock ./ RUN yarn diff --git a/frontend/cloudbuild.yaml b/frontend/cloudbuild.yaml index 1f63b69..04c3d7e 100644 --- a/frontend/cloudbuild.yaml +++ b/frontend/cloudbuild.yaml @@ -4,9 +4,11 @@ steps: args: - build - '-t' - - '${_DOCKER_PUBLISH_URL}' + - '${_DOCKER_TAG}' - '--cache-from' - - '${_DOCKER_PUBLISH_URL}' + - '${_DOCKER_TAG}' - '--build-arg' - 'BACKEND_URL=${_BACKEND_URL}' - '.' + +images: ['${_DOCKER_TAG}']