Revert dev docker files

remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent 7369d37ff4
commit 091f34ebca
  1. 18
      docker/Dockerfile.dev
  2. 24
      docker/docker-compose-dev.yml

@ -0,0 +1,18 @@
FROM node:9.11.1-alpine as front
RUN apk update && apk add python alpine-sdk --no-cache
WORKDIR /web/
ADD ./web/yarn.lock /web/
ADD ./web/package.json /web/
RUN yarn install
ADD ./web/ /web/
RUN yarn build
FROM python:3.6
ENV PYTHONUNBUFFERED 1
RUN mkdir /app
WORKDIR /app
ADD requirements.txt /app/
RUN pip install --no-cache-dir -r requirements.txt
ADD . /app/
COPY --from=front /web/build/ /app/web/build/
RUN python manage.py collectstatic --no-input

@ -2,29 +2,35 @@ version: '3'
services:
db:
image: postgres:10-alpine
image: postgres:alpine
restart: always
env_file:
- .env
ports:
- "127.0.0.1:5432:5432"
volumes:
- ./postgres_data:/var/lib/postgresql/data/pgdata
- ./data/postgres_dev:/var/lib/postgresql/data
redis:
image: redis:latest
image: redis:alpine
restart: always
ports:
- "127.0.0.1:6379:6379"
volumes:
- ./redis_data:/data
- ./data/redis_dev:/data
web:
build: .
build:
context: ../
dockerfile: docker/Dockerfile.dev
restart: always
volumes:
- .:/lilcity
command: bash -c "python manage.py collectstatic --no-input && python manage.py migrate && python manage.py loaddata /lilcity/apps/*/fixtures/*.json && gunicorn --workers=4 project.wsgi --bind=0.0.0.0:8000 --worker-class=gthread --reload"
command: bash -c "python manage.py collectstatic --no-input && python manage.py migrate && gunicorn --workers=4 project.wsgi --bind=0.0.0.0:8000 --worker-class=gthread --reload"
env_file:
- .env
volumes:
- ./data/media_dev:/app/media
ports:
- "127.0.0.1:${PORT}:8000"
depends_on:
@ -35,13 +41,17 @@ services:
- redis
workers:
build: .
build:
context: ../
dockerfile: docker/Dockerfile.dev
restart: always
volumes:
- .:/lilcity
command: bash -c "celery worker -A project -B"
env_file:
- .env
volumes:
- ./data/media_dev:/app/media
depends_on:
- db
- redis
Loading…
Cancel
Save