diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 218f25f6..521adaf7 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -2,7 +2,7 @@ FROM centos:7 ENV GOSU_VERSION=1.11 RUN yum install -y make git gcc libcurl-devel sqlite-devel pkg-config && \ - yum install -y http://downloads.dlang.org/releases/2.x/2.091.0/dmd-2.091.0-0.fedora.x86_64.rpm && \ + yum install -y http://downloads.dlang.org/releases/2.x/2.092.1/dmd-2.092.1-0.fedora.x86_64.rpm && \ rm -rf /var/cache/yum/ && \ # gosu installation gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ diff --git a/contrib/docker/Dockerfile-stretch b/contrib/docker/Dockerfile-stretch index d3da12e8..4f0aeac8 100644 --- a/contrib/docker/Dockerfile-stretch +++ b/contrib/docker/Dockerfile-stretch @@ -1,12 +1,13 @@ # -*-Dockerfile-*- FROM debian:stretch RUN apt update && \ - apt install -y build-essential curl libcurl4-openssl-dev libsqlite3-dev pkg-config git -RUN curl -fsS -o install.sh https://dlang.org/install.sh && \ - bash install.sh dmd + apt install -y build-essential curl libcurl4-openssl-dev libsqlite3-dev pkg-config git wget +RUN wget http://downloads.dlang.org/releases/2.x/2.092.1/dmd_2.092.1-0_amd64.deb -O /tmp/dmd_amd64.deb && \ + dpkg -i /tmp/dmd_amd64.deb +RUN rm -f /tmp/dmd_amd64.deb + COPY . /usr/src/onedrive -RUN . "$(bash install.sh -a)" && \ - cd /usr/src/onedrive/ && \ +RUN cd /usr/src/onedrive/ && \ ./configure && \ make clean && \ make && \