From 5a15a8ae27ca21400ef542f7b457ff9271b7d410 Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen@paragon-es.de> Date: Sun, 12 Jan 2020 13:20:11 +0100 Subject: [PATCH] docker/l3d#39 Update to git-extras version 5.1.0 by hard-copying column as a binary --- Dockerfile | 6 +++++- usrbin/column | Bin 0 -> 14344 bytes 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 usrbin/column diff --git a/Dockerfile b/Dockerfile index f71c944..2ea2e24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ ARG ALPINE_VERSION FROM alpine:${ALPINE_VERSION} +ARG VERSION + LABEL com.example.vendor="LakeDrops" \ maintainer="juergen.haas@lakedrops.com" \ version="${VERSION}" \ @@ -15,9 +17,11 @@ ARG apkArch ARG dockerArch ARG DOCKER_CHANNEL=stable ARG DOCKER_VERSION=19.03.5 -ARG GIT_EXTRAS_VERSION=4.7.0 +ARG GIT_EXTRAS_VERSION=5.1.0 ARG AHOY_VERSION=2.0.0 +ADD usrbin/column /usr/bin/column + RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \ set -eux && \ \ diff --git a/usrbin/column b/usrbin/column new file mode 100755 index 0000000000000000000000000000000000000000..ca9dfd2074dd4cc100fe2eee2bc24a7a0b8ba4cc GIT binary patch literal 14344 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 Hp6h=A6An=U literal 0 HcmV?d00001 -- GitLab