From 018d420141b620c3e8c80483a7344305d657ad95 Mon Sep 17 00:00:00 2001
From: Ryan Trauntvein <djdefi@github.com>
Date: Tue, 24 Oct 2017 13:59:25 -0700
Subject: [PATCH] Refactor to use stable archive

---
 .dockerignore                             |  2 ++
 Dockerfile                                | 35 ++++++++++++++---------
 share/github-backup-utils/ghe-docker-init | 12 ++++----
 3 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..988d907c9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+*
+!share/github-backup-utils/ghe-docker-init
diff --git a/Dockerfile b/Dockerfile
index 910162cdc..190359659 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,23 @@
 FROM debian:jessie-slim
-ARG bkup_version=2.11.1
-RUN DEBIAN_FRONTEND=noninteractive \
-    apt-get update && \
-    apt-get install -y wget rsync ssh git && \
-    apt-get clean && apt-get autoremove -q && \
-    rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man /tmp/*
-RUN wget https://github.com/github/backup-utils/releases/download/v${bkup_version}/github-backup-utils_${bkup_version}_amd64.deb
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    export DEBIAN_PRIORITY=critical && \
-    /usr/bin/dpkg -i github-backup-utils_${bkup_version}_amd64.deb && \
-    rm github-backup-utils_${bkup_version}_amd64.deb
-COPY share/github-backup-utils/ghe-docker-init /usr/share/github-backup-utils/ghe-docker-init
-RUN chmod +x /usr/share/github-backup-utils/ghe-docker-init
-ENTRYPOINT ["/usr/share/github-backup-utils/ghe-docker-init"]
+
+ARG bkup_version
+ENV bkup_version stable
+
+RUN apt-get -q -y update && \
+    apt-get install -y --no-install-recommends \
+    tar \
+    rsync \
+    ca-certificates \
+    ssh \
+    git \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /backup-utils-stable
+ADD https://github.com/github/backup-utils/archive/${bkup_version}.tar.gz /
+RUN tar xzvf /${bkup_version}.tar.gz --strip-components=1 -C /backup-utils-stable
+
+COPY share/github-backup-utils/ghe-docker-init /backup-utils-stable/share/github-backup-utils/ghe-docker-init
+RUN chmod +x /backup-utils-stable/share/github-backup-utils/ghe-docker-init
+
+ENTRYPOINT ["/backup-utils-stable/share/github-backup-utils/ghe-docker-init"]
 CMD ["ghe-host-check"]
diff --git a/share/github-backup-utils/ghe-docker-init b/share/github-backup-utils/ghe-docker-init
index 59c2604a2..c0db07b83 100755
--- a/share/github-backup-utils/ghe-docker-init
+++ b/share/github-backup-utils/ghe-docker-init
@@ -2,16 +2,18 @@
 
 set -e
 
+PATH=$PATH:/backup-utils-stable/bin
+
 mkdir -p /etc/github-backup-utils
 
 touch /etc/github-backup-utils/backup.config
 
 for VAR in `env`; do
-    if [[ $VAR =~ ^GHE_ ]]; then
-        backuputils_name=`echo "$VAR" | sed -r "s/GHE_(.*)=.*/\1/g" | tr '[:upper:]' '[:lower:]'`
-        backuputils_value=`echo "$VAR" | sed -r "s/.*=(.*)/\1/g"`
-        echo "${backuputils_name}=${backuputils_value}" >> /etc/github-backup-utils/backup.config
-    fi
+  if [[ $VAR =~ ^GHE_ ]]; then
+      backuputils_name=`echo "$VAR" | sed -r "s/GHE_(.*)=.*/\1/g" | tr '[:upper:]' '[:lower:]'`
+      backuputils_value=`echo "$VAR" | sed -r "s/.*=(.*)/\1/g"`
+      echo "${backuputils_name}=${backuputils_value}" >> /etc/github-backup-utils/backup.config
+  fi
 done
 
 exec "$@"