Browse Source

Fix some stuff from rebase.

feature/bike-tracking
Drew Larson 8 years ago
parent
commit
8b4af40a10
  1. 3
      Dockerfile-dev
  2. 5
      docker-compose.dev.yml

3
Dockerfile-dev

@ -1,4 +1,7 @@
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

5
docker-compose.dev.yml

@ -8,11 +8,6 @@ services:
ports: ports:
- "8000:8000" - "8000:8000"
- "62260:62260" - "62260:62260"
depends_on:
- webpack
links:
- redis
- db
volumes: volumes:
- ./bikeshop_project:/code:rw - ./bikeshop_project:/code:rw
volumes_from: volumes_from:

Loading…
Cancel
Save