diff --git a/Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1 b/Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1 index 5cb6855..f6d9186 100644 --- a/Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1 +++ b/Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1 @@ -1,12 +1,8 @@ FROM ruby:2.1 -ENV PACKAGES="git-core" \ - LC_ALL=en_US.UTF-8 - ADD / / RUN /scripts/install-essentials RUN /scripts/install-phantomjs 2.1.1 -RUN /scripts/install-git RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 diff --git a/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1 b/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1 index a51c43b..4241ed6 100644 --- a/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1 +++ b/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1 @@ -1,12 +1,8 @@ FROM ruby:2.3 -ENV PACKAGES="git-core" \ - LC_ALL=en_US.UTF-8 - ADD / / RUN /scripts/install-essentials RUN /scripts/install-phantomjs 2.1.1 -RUN /scripts/install-git RUN locale-gen en_US.UTF-8 ENV LANG en_US.UTF-8 diff --git a/scripts/install-essentials b/scripts/install-essentials index 0d17128..eeaaa52 100755 --- a/scripts/install-essentials +++ b/scripts/install-essentials @@ -11,7 +11,10 @@ apt-get install -y \ libxslt-dev libcurl4-openssl-dev libicu-dev \ logrotate python-docutils pkg-config cmake nodejs \ libkrb5-dev postgresql-client mysql-client unzip \ - $PACKAGES + +echo deb http://httpredir.debian.org/debian stretch main > /etc/apt/sources.list +apt-get update -yqqq +apt-get install -yqq --force-yes git # Set UTF-8 # http://stackoverflow.com/a/3182519/2137281 diff --git a/scripts/install-git b/scripts/install-git deleted file mode 100755 index 5a14926..0000000 --- a/scripts/install-git +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -xeo pipefail - -cd /tmp -wget https://www.kernel.org/pub/software/scm/git/git-2.7.4.tar.gz -echo '7104c4f5d948a75b499a954524cb281fe30c6649d8abe20982936f75ec1f275b git-2.7.4.tar.gz' | shasum -a256 -c - -tar -xzf git-2.7.4.tar.gz - -cd git-2.7.4/ -./configure -make prefix=/usr/local all - -cd / -rm -rf /tmp/*