From ce3af5194f42452186ae2567bd03640b5513876d Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Fri, 2 Mar 2018 00:14:55 +0100
Subject: [PATCH] Minor fixes to docker setup
---
dev.yml | 2 ++
front/Dockerfile | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev.yml b/dev.yml
index e3cd50da..2c102f3a 100644
--- a/dev.yml
+++ b/dev.yml
@@ -36,6 +36,7 @@ services:
- C_FORCE_ROOT=true
- "DATABASE_URL=postgresql://postgres@postgres/postgres"
- "CACHE_URL=redis://redis:6379/0"
+ - "FUNKWHALE_URL=http://funkwhale.test"
volumes:
- ./api:/app
- ./data/music:/music
@@ -54,6 +55,7 @@ services:
- "DJANGO_SECRET_KEY=dev"
- "DATABASE_URL=postgresql://postgres@postgres/postgres"
- "CACHE_URL=redis://redis:6379/0"
+ - "FUNKWHALE_URL=http://funkwhale.test"
links:
- postgres
- redis
diff --git a/front/Dockerfile b/front/Dockerfile
index cdf92446..60b03c9b 100644
--- a/front/Dockerfile
+++ b/front/Dockerfile
@@ -3,8 +3,7 @@ FROM node:9
EXPOSE 8080
WORKDIR /app/
ADD package.json .
-RUN yarn install --only=production
-RUN yarn install --only=dev
+RUN yarn install
VOLUME ["/app/node_modules"]
COPY . .
--
GitLab