From bd7eb38720ab432f6fddc0459b1f6ede50052b27 Mon Sep 17 00:00:00 2001 From: Dimitri Fontaine Date: Sat, 24 Feb 2018 23:55:47 +0100 Subject: [PATCH] Review Dockerfiles. Upgrade to stretch in the docker builds and improve disk footprint to some degree, using classic docker tricks. See #748. --- Dockerfile | 13 +++++++++---- Dockerfile.ccl | 16 +++++++++++----- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index fd58868..6fc43dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,14 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER Dimitri Fontaine -RUN apt-get update -RUN apt-get install -y wget curl make git bzip2 time libzip-dev libssl1.0.0 openssl -RUN apt-get install -y patch unzip libsqlite3-dev gawk freetds-dev sbcl +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + wget curl make git bzip2 time \ + ca-certificates \ + libzip-dev libssl1.1 openssl \ + patch unzip libsqlite3-dev gawk \ + freetds-dev sbcl && \ + rm -rf /var/lib/apt/lists/* ADD ./ /opt/src/pgloader WORKDIR /opt/src/pgloader diff --git a/Dockerfile.ccl b/Dockerfile.ccl index eaf8aa2..a33f8c9 100644 --- a/Dockerfile.ccl +++ b/Dockerfile.ccl @@ -1,12 +1,18 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER Dimitri Fontaine -RUN apt-get update -RUN apt-get install -y wget curl make git bzip2 time libzip-dev libssl1.0.0 openssl -RUN apt-get install -y patch unzip libsqlite3-dev gawk freetds-dev subversion +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + wget curl make git bzip2 time \ + ca-certificates \ + libzip-dev libssl1.1 openssl \ + patch unzip libsqlite3-dev gawk \ + freetds-dev sbcl && \ + rm -rf /var/lib/apt/lists/* WORKDIR /usr/local/src -RUN svn co http://svn.clozure.com/publicsvn/openmcl/release/1.11/linuxx86/ccl +RUN curl --location -O https://github.com/Clozure/ccl/releases/download/v1.11.5/ccl-1.11.5-linuxx86.tar.gz +RUN tar xf ccl-1.11.5-linuxx86.tar.gz RUN cp /usr/local/src/ccl/scripts/ccl64 /usr/local/bin/ccl ADD ./ /opt/src/pgloader