Fix somme encoding issues in Dockerfile

This commit is contained in:
Lucas Verney 2017-11-26 21:53:59 +01:00
parent 571b42f5b1
commit 00904a2e6e
2 changed files with 13 additions and 14 deletions

View File

@ -5,14 +5,14 @@ A basic `Dockerfile` is available for rapid testing. It is still really hacky
and should not be used in production. and should not be used in production.
1. First, build the docker image: 1\. First, build the docker image:
``` ```
cd docker cd docker
docker build -t bnjbvr/flatisfy . docker build -t phyks/flatisfy .
``` ```
2. Then, create some folder to store your Flatisfy data in a permanent way (it 2\. Then, create some folder to store your Flatisfy data in a permanent way (it
will be mount as a Docker volume in next steps), and initialize an empty will be mount as a Docker volume in next steps), and initialize an empty
config: config:
@ -20,19 +20,19 @@ docker build -t bnjbvr/flatisfy .
mkdir flatisfy mkdir flatisfy
cd flatisfy cd flatisfy
FLATISFY_VOLUME=$(pwd) FLATISFY_VOLUME=$(pwd)
docker run -P -v $FLATISFY_VOLUME:/flatisfy -p 8080:8080 bnjbvr/flatisfy sh -c "cd /home/user/app && python -m flatisfy init-config > /flatisfy/config.json" docker run -P -v $FLATISFY_VOLUME:/flatisfy -p 8080:8080 phyks/flatisfy sh -c "cd /home/user/app && python -m flatisfy init-config > /flatisfy/config.json"
``` ```
3. Then, edit the generated `config.json` file according to your needs. See 3\. Then, edit the generated `config.json` file according to your needs. See
[0.getting_started.md](0.getting_started.md) for more infos on the [0.getting_started.md](0.getting_started.md) for more infos on the
configuration file format. configuration file format.
4. Finally, run the docker image to fetch flats and serve the web UI: 4\. Finally, run the docker image to fetch flats and serve the web UI:
``` ```
docker run -P -v $FLATISFY_VOLUME:/flatisfy -p 8080:8080 bnjbvr/flatisfy docker run -P -v $FLATISFY_VOLUME:/flatisfy -p 8080:8080 phyks/flatisfy
``` ```
Your Flatisfy instance is now available at `localhost:8080`! Your Flatisfy instance is now available at `localhost:8080`!

View File

@ -1,20 +1,19 @@
FROM python:2 FROM python:2
MAINTAINER Benjamin Bouvier <public@benj.me> MAINTAINER Phyks <phyks@phyks.me>
ENV LANG C.UTF-8
# Setup layout. # Setup layout.
RUN useradd -d /home/user -m -s /bin/bash -U user RUN useradd -d /home/user -m -s /bin/bash -U user
# Install OS dependencies. # Install OS dependencies.
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y git python python-dev libffi-dev \ apt-get install -y git libffi-dev \
libxml2-dev libxslt-dev libyaml-dev libtiff-dev libjpeg-dev zlib1g-dev \ libxml2-dev libxslt-dev libyaml-dev libtiff-dev libjpeg-dev zlib1g-dev \
libfreetype6-dev libwebp-dev build-essential gcc g++ wget; libfreetype6-dev libwebp-dev build-essential gcc g++ wget;
# Install latest pip and python dependencies. # Install latest pip and python dependencies.
RUN cd /tmp && \ RUN pip install -U setuptools && \
wget https://bootstrap.pypa.io/get-pip.py && \
python ./get-pip.py && \
pip install -U setuptools && \
pip install html2text simplejson BeautifulSoup pip install html2text simplejson BeautifulSoup
# Install node.js. # Install node.js.
@ -24,7 +23,7 @@ RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \
# Install weboob's code itself. # Install weboob's code itself.
RUN git clone https://git.weboob.org/weboob/devel /home/user/weboob \ RUN git clone https://git.weboob.org/weboob/devel /home/user/weboob \
&& cd /home/user/weboob \ && cd /home/user/weboob \
&& python ./setup.py install && pip install .
RUN mkdir -p /flatisfy/data RUN mkdir -p /flatisfy/data
VOLUME /flatisfy VOLUME /flatisfy