Browse Source

Merge pull request #15 from BridgeCityBicycleCoop/development

Rename docker files for automated build.
feature/python-error-tracking
Drew Larson 8 years ago
committed by GitHub
parent
commit
6a21d0473d
  1. 14
      Dockerfile
  2. 8
      Dockerfile-dev
  3. 14
      Dockerfile-prod
  4. 1
      docker-compose.dev.yml
  5. 2
      docker-compose.prod.yml

14
Dockerfile

@ -1,8 +1,14 @@
FROM python:3.6 FROM python:3.6
RUN apt-get install curl
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
RUN apt-get install -y nodejs
RUN mkdir /code RUN mkdir /code
WORKDIR /code WORKDIR /code
RUN mkdir requirements RUN mkdir requirements
ADD ./bikeshop_project /code ADD bikeshop_project /code
COPY ./requirements /code/requirements COPY requirements /code/requirements
RUN pip install -r ./requirements/development.txt RUN pip install -r requirements/production.txt
EXPOSE 8000:8000 RUN npm cache clean
RUN npm install --unsafe-perm
RUN npm run build-production
RUN DJANGO_SETTINGS_MODULE=bikeshop.settings.production python manage.py collectstatic --no-input

8
Dockerfile-dev

@ -0,0 +1,8 @@
FROM python:3.6
RUN mkdir /code
WORKDIR /code
RUN mkdir requirements
ADD ./bikeshop_project /code
COPY ./requirements /code/requirements
RUN pip install -r ./requirements/development.txt
EXPOSE 8000:8000

14
Dockerfile-prod

@ -1,14 +0,0 @@
FROM python:3.6
RUN apt-get install curl
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash -
RUN apt-get install -y nodejs
RUN mkdir /code
WORKDIR /code
RUN mkdir requirements
ADD bikeshop_project /code
COPY requirements /code/requirements
RUN pip install -r requirements/production.txt
RUN npm cache clean
RUN npm install --unsafe-perm
RUN npm run build-production
RUN DJANGO_SETTINGS_MODULE=bikeshop.settings.production python manage.py collectstatic --no-input

1
docker-compose.dev.yml

@ -3,6 +3,7 @@ services:
workstand: workstand:
build: build:
context: . context: .
dockerfile: Dockerfile-dev
command: python manage.py runserver 0.0.0.0:8000 command: python manage.py runserver 0.0.0.0:8000
ports: ports:
- "8000:8000" - "8000:8000"

2
docker-compose.prod.yml

@ -13,7 +13,7 @@ services:
workstand: workstand:
build: build:
context: . context: .
dockerfile: Dockerfile-prod dockerfile: Dockerfile
image: bcbc/workstand:production image: bcbc/workstand:production
env_file: env_file:
- workstand.env - workstand.env

Loading…
Cancel
Save