From d74a516967126d6cee7a70a198eb5c133f838c89 Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Sat, 20 Apr 2019 07:10:13 -0700
Subject: [PATCH] Switch to locally installed MongoDB packages

---
 CHANGELOG.md |  9 ++++-----
 Dockerfile   | 44 +++++++++++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0e3dd5..6e84d7c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,10 @@
-## 1.13 - 2019-03-09 - <dave at tiredofit dot ca>
+## 1.13 - 2019-04-20 - <dave at tiredofit dot ca>
 
-* Fixed Postgres backup without SPLIT_DB enabled (credit MelwinKfr@github)
-* Added DB_PORT reference to properly backup Postgres with non default ports (thanks Maxximus007@github)
+* Switch to using locally built mongodb-tools from tiredofit/mongo-builder due to Alpine removing precompiled packages from repositories
 
-## 1.12 - 2019-03-01 - <stevetodorov at github>
+## 1.12 - 2018-12-03 - <dave at tiredofit dot ca>
 
-* Fix for XZ Compression failing
+* MongoDB Backup Fix
 
 ## 1.11 - 2018-11-19 - <skylord123 at github>
 
diff --git a/Dockerfile b/Dockerfile
index 6ed8da1..b1834ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,11 @@
+FROM tiredofit/mongo-builder as mongo-packages
+
 FROM tiredofit/alpine:edge
 LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
 
+### Copy Mongo Packages
+COPY --from=mongo-packages / /usr/src/apk
+
 ### Set Environment Variables
    ENV ENABLE_CRON=FALSE \
        ENABLE_SMTP=FALSE
@@ -17,9 +22,9 @@ LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
            xz-dev \
            && \
            \
-       apk add --virtual .db-backup-run-deps  \
+       apk add -t .db-backup-run-deps \
        	   bzip2 \
-           mongodb-tools \
+           influxdb \
            mariadb-client \
            libressl \
            pigz \
@@ -28,22 +33,27 @@ LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
            redis \
            xz \
            && \
-        apk add \
-            influxdb@testing \
-            pixz@testing \
+       apk add \
+           pixz@testing \
            && \
-          \
-          cd /usr/src && \
-          mkdir -p pbzip2 && \
-          curl -ssL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xvfz - --strip=1 -C /usr/src/pbzip2 && \
-          cd pbzip2 && \
-          make && \
-          make install && \
-          \
-          # Cleanup
-          rm -rf /usr/src/* && \
-          apk del .db-backup-build-deps && \
-          rm -rf /tmp/* /var/cache/apk/*
+        
+       ## Locally Install Mongo Package
+       cd /usr/src/apk && \
+       apk add -t .db-backup-mongo-deps --allow-untrusted \
+           mongodb-tools*.apk \
+           && \
+       \
+       cd /usr/src && \
+       mkdir -p pbzip2 && \
+       curl -ssL https://launchpad.net/pbzip2/1.1/1.1.13/+download/pbzip2-1.1.13.tar.gz | tar xvfz - --strip=1 -C /usr/src/pbzip2 && \
+       cd pbzip2 && \
+       make && \
+       make install && \
+       \
+### Cleanup
+       rm -rf /usr/src/* && \
+       apk del .db-backup-build-deps && \
+       rm -rf /tmp/* /var/cache/apk/*
 
 ### S6 Setup
     ADD install  /