diff --git a/build-scripts/docker-build-env/Dockerfile b/build-scripts/docker-build-env/Dockerfile index ef07172b5..7d5756dce 100644 --- a/build-scripts/docker-build-env/Dockerfile +++ b/build-scripts/docker-build-env/Dockerfile @@ -14,7 +14,9 @@ RUN apt-get update && apt-get install -y \ VOLUME /var/lib/docker RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -RUN apt-get update && apt-get install -y docker-ce && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y \ + docker-ce \ + && rm -rf /var/lib/apt/lists/* # setup arm binary support RUN apt-get update && apt-get install -y \ diff --git a/build-scripts/yocto-build-env/Dockerfile b/build-scripts/yocto-build-env/Dockerfile index f801a0d50..7b7c60aae 100644 --- a/build-scripts/yocto-build-env/Dockerfile +++ b/build-scripts/yocto-build-env/Dockerfile @@ -1,28 +1,57 @@ FROM ubuntu:16.04 # Install the following utilities (required by poky) -RUN apt-get update && apt-get install -y build-essential chrpath curl diffstat gcc-multilib gawk git-core libsdl1.2-dev texinfo unzip wget xterm cpio file python3 && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y \ + build-essential \ + chrpath \ + curl \ + diffstat \ + gcc-multilib \ + gawk \ + git-core \ + libsdl1.2-dev \ + texinfo \ + unzip \ + wget \ + xterm \ + cpio \ + file \ + python3 \ + && rm -rf /var/lib/apt/lists/* # Set the locale to UTF-8 for bulding with poky morty RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 # Additional host packages required by resin -RUN apt-get update && apt-get install -y apt-transport-https && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y \ + apt-transport-https \ + && rm -rf /var/lib/apt/lists/* RUN curl --silent https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - ENV NODE_VERSION node_4.x ENV DISTRO vivid RUN echo "deb https://deb.nodesource.com/$NODE_VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list &&\ echo "deb-src https://deb.nodesource.com/$NODE_VERSION $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list -RUN apt-get update && apt-get install -y jq nodejs sudo && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y \ + jq \ + nodejs \ + sudo \ + && rm -rf /var/lib/apt/lists/* # Install docker # https://docs.docker.com/engine/installation/linux/ubuntu/#install-using-the-repository -RUN apt-get update && apt-get install -y apt-transport-https ca-certificates curl software-properties-common && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y \ + apt-transport-https \ + ca-certificates \ + curl \ + software-properties-common \ + && rm -rf /var/lib/apt/lists/* VOLUME /var/lib/docker RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - RUN add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -RUN apt-get update && apt-get install -y docker-ce && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y \ + docker-ce \ + && rm -rf /var/lib/apt/lists/* COPY run-resinos.sh / diff --git a/supervisor/Dockerfile b/supervisor/Dockerfile index 7938b4083..56a275d86 100644 --- a/supervisor/Dockerfile +++ b/supervisor/Dockerfile @@ -1 +1,14 @@ FROM %%BASE_IMAGE%% + +# remove several traces of python +RUN apk del --no-cache python* + +# http://bugs.python.org/issue19846 +# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. +ENV LANG C.UTF-8 + +# setup base +RUN apk add --no-cache python3 + +# install aiohttp +RUN pip3 install pip --no-cache --upgrade && pip3 install --no-cache aiohttp