From 8b4af40a10f2c8741e795422596407140093ea42 Mon Sep 17 00:00:00 2001 From: Drew Larson Date: Thu, 19 Jan 2017 21:53:55 -0600 Subject: [PATCH] Fix some stuff from rebase. --- Dockerfile-dev | 3 +++ docker-compose.dev.yml | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile-dev b/Dockerfile-dev index 4d4dcaa..826550b 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -1,4 +1,7 @@ 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 diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b5f7e13..aa5c443 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -8,11 +8,6 @@ services: ports: - "8000:8000" - "62260:62260" - depends_on: - - webpack - links: - - redis - - db volumes: - ./bikeshop_project:/code:rw volumes_from: