From daaf3b566377024d66001b01568fa427bd60bed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Thu, 27 Apr 2017 13:51:02 +0200 Subject: [PATCH] Updated Dockerfile for using yarn. --- Dockerfile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index f54b9d658..71269a8c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,34 +1,37 @@ FROM python:3.5 RUN apt-get -y update && apt-get -y upgrade -RUN apt-get install -y libpq-dev supervisor +RUN apt-get install -y libpq-dev supervisor curl ## BUILD JS STUFF -RUN cd /tmp -RUN wget https://nodejs.org/dist/v4.5.0/node-v4.5.0-linux-x64.tar.xz -RUN cd /tmp && tar xfvJ /node-v4.5.0-linux-x64.tar.xz +RUN wget https://nodejs.org/dist/v4.5.0/node-v4.5.0-linux-x64.tar.xz -P /tmp +RUN cd /tmp && tar xfvJ node-v4.5.0-linux-x64.tar.xz RUN ln -sf /tmp/node-v4.5.0-linux-x64/bin/node /usr/bin/node RUN useradd -m openslides -RUN mkdir /app && chown openslides /app +RUN mkdir /app ADD package.json /app +ADD yarn.lock /app ADD bower.json /app +ADD gulpfile.js /app WORKDIR /app -RUN /tmp/node-v4.5.0-linux-x64/bin/npm install; exit 0 #ignore errors in npm scripts -RUN su -c 'node_modules/.bin/bower --config.interactive=false install' openslides +RUN chown -R openslides /app +USER openslides +RUN curl -o- -L https://yarnpkg.com/install.sh | bash +RUN $HOME/.yarn/bin/yarn --non-interactive # INSTALL PYTHON DEPENDENCIES +USER root ADD requirements_production.txt /app/requirements_production.txt RUN pip install -r /app/requirements_production.txt RUN pip install django-redis asgi-redis django-redis-sessions psycopg2 ## Clean up -RUN apt-get remove -y python3-pip wget +RUN apt-get remove -y python3-pip wget curl RUN rm -rf /var/lib/apt/lists/* # BUILD APP ADD . /app RUN node_modules/.bin/gulp --production -RUN rm -fr /tmp/node-v4.5.0-linux-x64/ RUN rm -fr /app/bower_components RUN rm -fr /app/node_modules