Fix dockerfile to build with gulp4/node10.
This commit is contained in:
parent
4007610a54
commit
2129ffe73a
@ -8,7 +8,7 @@ python:
|
||||
- "3.5"
|
||||
- "3.6"
|
||||
env:
|
||||
- TRAVIS_NODE_VERSION="10.1"
|
||||
- TRAVIS_NODE_VERSION="10.5"
|
||||
before_install:
|
||||
- nvm install $TRAVIS_NODE_VERSION
|
||||
- curl -o- -L https://yarnpkg.com/install.sh | bash
|
||||
|
22
Dockerfile
22
Dockerfile
@ -1,39 +1,33 @@
|
||||
FROM python:3.5
|
||||
RUN apt-get -y update && apt-get -y upgrade
|
||||
|
||||
RUN apt-get install -y libpq-dev supervisor curl vim
|
||||
## BUILD JS STUFF
|
||||
RUN wget https://nodejs.org/dist/v10.1.0/node-v10.1.0-linux-x64.tar.xz -P /tmp && \
|
||||
cd /tmp && tar xfvJ node-v10.1.0-linux-x64.tar.xz && \
|
||||
ln -sf /tmp/node-v10.1.0-linux-x64/bin/node /usr/bin/node
|
||||
RUN useradd -m openslides
|
||||
|
||||
## BUILD JS STUFF
|
||||
RUN wget https://nodejs.org/dist/v10.5.0/node-v10.5.0-linux-x64.tar.xz -P /tmp && \
|
||||
cd /tmp && tar xfvJ node-v10.5.0-linux-x64.tar.xz && \
|
||||
ln -sf /tmp/node-v10.5.0-linux-x64/bin/node /usr/bin/node
|
||||
RUN mkdir /app
|
||||
COPY package.json yarn.lock bower.json gulpfile.js /app/
|
||||
WORKDIR /app
|
||||
COPY . /app
|
||||
RUN chown -R openslides /app
|
||||
USER openslides
|
||||
RUN curl -o- -L https://yarnpkg.com/install.sh | bash
|
||||
RUN $HOME/.yarn/bin/yarn --non-interactive
|
||||
RUN node_modules/.bin/gulp --production
|
||||
|
||||
# INSTALL PYTHON DEPENDENCIES
|
||||
USER root
|
||||
COPY requirements_*.txt /app/
|
||||
RUN pip install -r /app/requirements_big_mode.txt
|
||||
|
||||
## Clean up
|
||||
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 -rf /var/lib/apt/lists/* && \
|
||||
rm -fr /app/bower_components && \
|
||||
rm -fr /app/node_modules
|
||||
|
||||
RUN mkdir /data && chown openslides /data
|
||||
USER openslides
|
||||
EXPOSE 8000
|
||||
USER openslides
|
||||
VOLUME /supervisord.conf
|
||||
VOLUME /data
|
||||
|
Loading…
Reference in New Issue
Block a user