Update Dockerfiles (#980)

* Update Dockerfile-stretch to use package install rather than install.sh
* Align binary versions of DMD
This commit is contained in:
abraunegg 2020-07-03 07:51:22 +10:00 committed by GitHub
parent d7348ed868
commit 578d560a62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions

View file

@ -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 \

View file

@ -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 && \