Skip to content

Commit d74a516

Browse files
committed
Switch to locally installed MongoDB packages
1 parent b0a5faf commit d74a516

File tree

2 files changed

+31
-22
lines changed

2 files changed

+31
-22
lines changed

CHANGELOG.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
## 1.13 - 2019-03-09 - <dave at tiredofit dot ca>
1+
## 1.13 - 2019-04-20 - <dave at tiredofit dot ca>
22

3-
* Fixed Postgres backup without SPLIT_DB enabled (credit MelwinKfr@github)
4-
* Added DB_PORT reference to properly backup Postgres with non default ports (thanks Maxximus007@github)
3+
* Switch to using locally built mongodb-tools from tiredofit/mongo-builder due to Alpine removing precompiled packages from repositories
54

6-
## 1.12 - 2019-03-01 - <stevetodorov at github>
5+
## 1.12 - 2018-12-03 - <dave at tiredofit dot ca>
76

8-
* Fix for XZ Compression failing
7+
* MongoDB Backup Fix
98

109
## 1.11 - 2018-11-19 - <skylord123 at github>
1110

Dockerfile

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
FROM tiredofit/mongo-builder as mongo-packages
2+
13
FROM tiredofit/alpine:edge
24
LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
35

6+
### Copy Mongo Packages
7+
COPY --from=mongo-packages / /usr/src/apk
8+
49
### Set Environment Variables
510
ENV ENABLE_CRON=FALSE \
611
ENABLE_SMTP=FALSE
@@ -17,9 +22,9 @@ LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
1722
xz-dev \
1823
&& \
1924
\
20-
apk add --virtual .db-backup-run-deps \
25+
apk add -t .db-backup-run-deps \
2126
bzip2 \
22-
mongodb-tools \
27+
influxdb \
2328
mariadb-client \
2429
libressl \
2530
pigz \
@@ -28,22 +33,27 @@ LABEL maintainer="Dave Conroy (dave at tiredofit dot ca)"
2833
redis \
2934
xz \
3035
&& \
31-
apk add \
32-
influxdb@testing \
33-
pixz@testing \
36+
apk add \
37+
pixz@testing \
38+
&& \
39+
40+
## Locally Install Mongo Package
41+
cd /usr/src/apk && \
42+
apk add -t .db-backup-mongo-deps --allow-untrusted \
43+
mongodb-tools*.apk \
3444
&& \
35-
\
36-
cd /usr/src && \
37-
mkdir -p pbzip2 && \
38-
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 && \
39-
cd pbzip2 && \
40-
make && \
41-
make install && \
42-
\
43-
# Cleanup
44-
rm -rf /usr/src/* && \
45-
apk del .db-backup-build-deps && \
46-
rm -rf /tmp/* /var/cache/apk/*
45+
\
46+
cd /usr/src && \
47+
mkdir -p pbzip2 && \
48+
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 && \
49+
cd pbzip2 && \
50+
make && \
51+
make install && \
52+
\
53+
### Cleanup
54+
rm -rf /usr/src/* && \
55+
apk del .db-backup-build-deps && \
56+
rm -rf /tmp/* /var/cache/apk/*
4757

4858
### S6 Setup
4959
ADD install /

0 commit comments

Comments
 (0)