diff --git a/pica-tellform/Dockerfile b/pica-tellform/Dockerfile index 51a357032f82e7037867e34976bc7c46423f244e..4e591a5bd15cb206bfa13089916cad3e8e672c1a 100644 --- a/pica-tellform/Dockerfile +++ b/pica-tellform/Dockerfile @@ -3,8 +3,8 @@ LABEL maintainer="liam.dhenin@etu.utc.fr" ENV NODE_ENV="development" FROM base as downloader -RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list -RUN apt-get update && \ +RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list && \ + apt-get update && \ apt-get install -y \ bzip2 \ git \ @@ -24,9 +24,11 @@ WORKDIR /opt/tellform # Trouver mieux que le git clone... #COPY entrypoint.sh /opt/tellform/entrypoint.sh RUN git clone https://github.com/tellform/tellform . && git checkout stable2.1 -RUN npm install -RUN bower install -RUN grunt build +COPY tellform-patch.patch /opt +RUN cd /opt; patch -p0 < tellform-patch.patch; exit 0 && \ + npm install && \ + bower install && \ + grunt build FROM base @@ -38,10 +40,10 @@ RUN chmod +x /opt/tellform/entrypoint.sh && \ COPY --from=downloader --chown=node /opt/tellform /opt/tellform -RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list -RUN apt update && apt install -y git -RUN apt install -y vim -RUN npm install -g bower grunt-cli +RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list && \ + apt update && apt install -y git && \ + apt install -y vim && \ + npm install -g bower grunt-cli USER node WORKDIR /opt/tellform