From b50667cecccfcd2f06898e3553baaf7c61bc8cd8 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Fri, 15 Feb 2019 03:27:55 +0100 Subject: [PATCH] :whale: :art: Use external base image --- backend/Dockerfile | 59 +-------------------------------------------- frontend/Dockerfile | 59 +-------------------------------------------- 2 files changed, 2 insertions(+), 116 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 2007e0b55..1e87fa8e4 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,61 +1,4 @@ -FROM ubuntu:xenial -LABEL maintainer="Andrey Antukh " - -RUN set -ex; \ - apt-get update && \ - apt-get install -yq \ - locales \ - ca-certificates \ - wget \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - apt-get update -yq && \ - apt-get install -yq \ - bash \ - git \ - vim \ - openjdk-8-jdk \ - rlwrap \ - build-essential \ - imagemagick \ - webp \ - sudo \ - ; \ - mkdir -p /etc/resolvconf/resolv.conf.d; \ - echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail; \ - apt-get update -yq; \ - apt-get install -yq \ - libbz2-dev liblzma-dev zlib1g-dev libfftw3-dev \ - libfreetype6-dev libfontconfig1-dev libxt-dev \ - libexif-dev libjpeg-dev libpng-dev libtiff-dev \ - libwmf-dev libpango1.0-dev librsvg2-bin librsvg2-dev \ - libxml2-dev libwebp-dev webp autoconf \ - ; \ - git clone https://github.com/ImageMagick/ImageMagick.git imagemagick && \ - cd imagemagick && \ - git checkout -f 7.0.5-0 && \ - ./configure --prefix=/opt/img && \ - make -j2 && \ - make install && \ - cd .. && \ - rm -rf ./imagemagick - -WORKDIR /home/uxbox - -ENV NODE_VERSION=7.7.1 - -COPY ./scripts/lein /home/uxbox/.local/bin/lein -RUN set -ex; \ - git clone https://github.com/creationix/nvm.git .nvm; \ - bash -c "source .nvm/nvm.sh && nvm install $NODE_VERSION"; \ - bash -c "source .nvm/nvm.sh && nvm alias default $NODE_VERSION"; \ - bash -c "source .nvm/nvm.sh && nvm use default"; \ - bash -c "/home/uxbox/.local/bin/lein version" - -# add node and npm to path so the commands are available -ENV NVM_DIR /home/uxbox/.nvm -ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules -ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH +FROM monogramm:uxbox-builder # Copy backend source and build release COPY . /home/uxbox/backend diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 0251c3dd8..3db219bc0 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,61 +1,4 @@ -FROM ubuntu:xenial -LABEL maintainer="Andrey Antukh " - -RUN set -ex; \ - apt-get update && \ - apt-get install -yq \ - locales \ - ca-certificates \ - wget \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - apt-get update -yq && \ - apt-get install -yq \ - bash \ - git \ - vim \ - openjdk-8-jdk \ - rlwrap \ - build-essential \ - imagemagick \ - webp \ - sudo \ - ; \ - mkdir -p /etc/resolvconf/resolv.conf.d; \ - echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail; \ - apt-get update -yq; \ - apt-get install -yq \ - libbz2-dev liblzma-dev zlib1g-dev libfftw3-dev \ - libfreetype6-dev libfontconfig1-dev libxt-dev \ - libexif-dev libjpeg-dev libpng-dev libtiff-dev \ - libwmf-dev libpango1.0-dev librsvg2-bin librsvg2-dev \ - libxml2-dev libwebp-dev webp autoconf \ - ; \ - git clone https://github.com/ImageMagick/ImageMagick.git imagemagick && \ - cd imagemagick && \ - git checkout -f 7.0.5-0 && \ - ./configure --prefix=/opt/img && \ - make -j2 && \ - make install && \ - cd .. && \ - rm -rf ./imagemagick - -WORKDIR /home/uxbox - -ENV NODE_VERSION=7.7.1 - -COPY ./scripts/lein /home/uxbox/.local/bin/lein -RUN set -ex; \ - git clone https://github.com/creationix/nvm.git .nvm; \ - bash -c "source .nvm/nvm.sh && nvm install $NODE_VERSION"; \ - bash -c "source .nvm/nvm.sh && nvm alias default $NODE_VERSION"; \ - bash -c "source .nvm/nvm.sh && nvm use default"; \ - bash -c "/home/uxbox/.local/bin/lein version" - -# add node and npm to path so the commands are available -ENV NVM_DIR /home/uxbox/.nvm -ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules -ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH +FROM monogramm:uxbox-builder ENV API_URL http://127.0.0.1:6060/api