diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..f956ffb --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +backend/__pycache__ +backend/public +frontend/build +frontend/build-server +frontend/node_modules diff --git a/backend/.dockerignore b/backend/.dockerignore deleted file mode 100644 index 8aca0e0..0000000 --- a/backend/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -__pycache__ -public diff --git a/backend/Dockerfile b/backend/Dockerfile deleted file mode 100644 index 7cfb9d3..0000000 --- a/backend/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM python:3.7-alpine AS build -ARG EXTRA_DEPS -RUN apk add build-base musl-dev libffi-dev openssl-dev mariadb-dev -WORKDIR /app -RUN pip install -U setuptools 'cryptography>=3.0,<3.1' poetry==1.1.7 $EXTRA_DEPS -COPY pyproject.toml poetry.lock ./ -RUN poetry config virtualenvs.create false -RUN poetry install --no-dev --no-ansi --no-interaction - -FROM python:3.7-alpine AS package -WORKDIR /app -COPY --from=0 /usr /usr -COPY manage.py gunicorn.conf.py ./ -COPY tabby tabby - -COPY start.sh /start.sh -RUN ["chmod", "+x", "/start.sh"] - -RUN ./manage.py collectstatic --noinput - -CMD ["/start.sh"] diff --git a/backend/cloudbuild.yaml b/backend/cloudbuild.yaml deleted file mode 100644 index 9d90fee..0000000 --- a/backend/cloudbuild.yaml +++ /dev/null @@ -1,14 +0,0 @@ -steps: -- name: 'gcr.io/cloud-builders/docker' - dir: 'backend' - args: - - build - - '-t' - - '${_DOCKER_TAG}' - - '--cache-from' - - '${_DOCKER_TAG}' - - '--build-arg' - - 'EXTRA_DEPS=${_EXTRA_DEPS}' - - '.' - -images: ['${_DOCKER_TAG}'] diff --git a/cloudbuild.yaml b/cloudbuild.yaml deleted file mode 100644 index feed95d..0000000 --- a/cloudbuild.yaml +++ /dev/null @@ -1,15 +0,0 @@ -steps: -- name: 'gcr.io/cloud-builders/docker' - dir: '.' - args: - - build - - '-t' - - '${_DOCKER_TAG}' - - '--cache-from' - - '${_DOCKER_TAG}' - - '--build-arg' - - 'EXTRA_DEPS=${_EXTRA_DEPS}' - - '.' -timeout: 1200s - -images: ['${_DOCKER_TAG}'] diff --git a/frontend/.dockerignore b/frontend/.dockerignore deleted file mode 100644 index 8ec4f48..0000000 --- a/frontend/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -build -build-server -node_modules diff --git a/frontend/Dockerfile b/frontend/Dockerfile deleted file mode 100644 index c2df2df..0000000 --- a/frontend/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM node:12-alpine AS build -ARG BACKEND_URL -WORKDIR /app -COPY package.json yarn.lock ./ -RUN yarn -COPY webpack* tsconfig.json ./ -COPY assets assets -COPY src src -COPY theme theme -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/frontend/cloudbuild.yaml b/frontend/cloudbuild.yaml deleted file mode 100644 index aae2530..0000000 --- a/frontend/cloudbuild.yaml +++ /dev/null @@ -1,12 +0,0 @@ -steps: -- name: 'gcr.io/cloud-builders/docker' - dir: 'frontend' - args: - - build - - '-t' - - '${_DOCKER_TAG}' - - '--cache-from' - - '${_DOCKER_TAG}' - - '.' - -images: ['${_DOCKER_TAG}']