From 41ad6f231f8831e73e3e41d36a8f0362dff392ba Mon Sep 17 00:00:00 2001 From: abraunegg Date: Tue, 21 Apr 2020 07:59:04 +1000 Subject: [PATCH] Update CentOS Dockerfile (Issue #878) (#879) * Use RPM file on CentOS as invalid signature is occurring when using install.sh --- contrib/docker/Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile index 00e70100..218f25f6 100644 --- a/contrib/docker/Dockerfile +++ b/contrib/docker/Dockerfile @@ -2,9 +2,8 @@ FROM centos:7 ENV GOSU_VERSION=1.11 RUN yum install -y make git gcc libcurl-devel sqlite-devel pkg-config && \ - rm -rf /var/cache/yum/ && \ - curl -fsS -o install.sh https://dlang.org/install.sh && \ - bash install.sh dmd && \ + yum install -y http://downloads.dlang.org/releases/2.x/2.091.0/dmd-2.091.0-0.fedora.x86_64.rpm && \ + rm -rf /var/cache/yum/ && \ # gosu installation gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && curl -o /usr/local/bin/gosu -SL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64" \ @@ -16,9 +15,8 @@ RUN yum install -y make git gcc libcurl-devel sqlite-devel pkg-config && \ && gosu nobody true RUN mkdir -p /onedrive/conf /onedrive/data COPY . /usr/src/onedrive -RUN . "$(bash install.sh -a)" && \ - cd /usr/src/onedrive/ && \ - ./configure && \ +WORKDIR /usr/src/onedrive +RUN ./configure && \ make clean && \ make && \ make install