File tree Expand file tree Collapse file tree 4 files changed +30
-14
lines changed Expand file tree Collapse file tree 4 files changed +30
-14
lines changed Original file line number Diff line number Diff line change @@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
6
6
7
7
## [ Unreleased] [ ]
8
8
9
+ ## [ 1.0.0] [ ] - 2018-04-06
10
+ ### Added
11
+ - New mandatory parameter: ` SOFTLAYER_NETWORK ` to choose between
12
+ ` public ` and ` private ` for upload.
13
+
14
+ ### Updated
15
+ - Updated MySQL, Postgres, and MySQL modules.
16
+ - Updated Sentry Raven from ` 5.32.0 ` to ` 6.6.0 `
17
+
18
+ ### Fixed
19
+ - Fixed linter errors.
20
+
9
21
## [ 0.3.2] [ ] - 2017-12-20
10
22
### Fixed
11
23
- Made plugins fail with non-zero status for backup errors
@@ -52,8 +64,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
52
64
- Upload to Softlayer
53
65
- Travis CI for continuous integration
54
66
55
- [ Unreleased ] : https://github.ibm.com/bdu/gamora/compare/0.3.3 ...HEAD
56
- [ 0.3.3 ] : https://github.ibm.com/bdu/gamora/compare/0.3.2...0.3.3
67
+ [ Unreleased ] : https://github.ibm.com/bdu/gamora/compare/1.0.0 ...HEAD
68
+ [ 1.0.0 ] : https://github.ibm.com/bdu/gamora/compare/0.3.2...1.0.0
57
69
[ 0.3.2 ] : https://github.ibm.com/bdu/gamora/compare/0.3.1...0.3.2
58
70
[ 0.3.1 ] : https://github.ibm.com/bdu/gamora/compare/0.3.0...0.3.1
59
71
[ 0.3.0 ] : https://github.ibm.com/bdu/gamora/compare/0.2.1...0.3.0
Original file line number Diff line number Diff line change 8
8
9
9
# Install database clients
10
10
# Apply security patches
11
+ # hadolint ignore=DL3018
11
12
RUN echo 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
12
13
&& echo 'http://dl-3.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
13
14
&& apk add --no-cache \
14
15
bash \
15
16
libressl \
16
17
mariadb-client \
17
18
mongodb-tools \
19
+ openldap \
18
20
postgresql
19
21
20
22
ARG PIP_REPO_HOST_WITH_CREDS
@@ -27,19 +29,19 @@ RUN [[ -n "${PIP_REPO_HOST_WITH_CREDS:?}" ]] \
27
29
28
30
RUN mkdir /root/.pip
29
31
30
- RUN printf " [global]\n \
32
+ RUN printf ' [global]\n \
31
33
index-url = https://pypi.python.org/simple\n \
32
34
extra-index-url = %s\n \
33
- " "$PIP_REPO_HOST_WITH_CREDS" > /root/.pip/pip.conf
35
+ ' "$PIP_REPO_HOST_WITH_CREDS" > /root/.pip/pip.conf
34
36
35
- RUN printf " [distutils]\n \
37
+ RUN printf ' [distutils]\n \
36
38
index-servers = local\n \
37
39
\n \
38
40
[local]\n \
39
41
repository:%s\n \
40
42
username:%s\n \
41
43
password:%s\n \
42
- " "$PIP_REPO_HOST_WITH_CREDS" "$PIP_REPO_USERNAME" "$PIP_REPO_PASSWORD" \
44
+ ' "$PIP_REPO_HOST_WITH_CREDS" "$PIP_REPO_USERNAME" "$PIP_REPO_PASSWORD" \
43
45
> /root/.pypirc
44
46
45
47
RUN mkdir -p /gamora /gamora/pip
60
62
61
63
# Install database clients
62
64
# Apply security patches
65
+ # hadolint ignore=DL3018
63
66
RUN echo 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
64
67
&& echo 'http://dl-3.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
65
68
&& apk add --no-cache \
Original file line number Diff line number Diff line change @@ -38,10 +38,11 @@ upload_backup() {
38
38
39
39
log " Uploading backup"
40
40
monsoon " ${NOTIFICATION_SETTINGS[@]} " upload softlayer \
41
- -u " ${SOFTLAYER_USER:? } " \
42
- -p " ${SOFTLAYER_API_KEY:? } " \
43
- -d " ${SOFTLAYER_DATACENTER:? } " \
44
- -c " ${SOFTLAYER_CONTAINER:? } " \
41
+ --username " ${SOFTLAYER_USER:? } " \
42
+ --api-key " ${SOFTLAYER_API_KEY:? } " \
43
+ --datacenter " ${SOFTLAYER_DATACENTER:? } " \
44
+ --container " ${SOFTLAYER_CONTAINER:? } " \
45
+ --network " ${SOFTLAYER_NETWORK:? } " \
45
46
" ${BACKUP_PATH:? } /${filename:? } " \
46
47
" ${remote_path:? } /${filename:? } " \
47
48
&& rm -f " ${BACKUP_PATH:? } /${filename:? } "
Original file line number Diff line number Diff line change @@ -3,9 +3,9 @@ httplib2==0.9.2
3
3
monsoon-cli == 0.1.7
4
4
monsoon-backup-files == 0.1.3
5
5
monsoon-backup-mongo == 0.1.1
6
- monsoon-backup-mysql == 0.1.6
7
- monsoon-backup-postgresql == 0.1.4
6
+ monsoon-backup-mysql == 0.1.7
7
+ monsoon-backup-postgresql == 0.1.5
8
8
monsoon-notifier-sentry == 0.1.3
9
- monsoon-upload-softlayer == 0.1.5
10
- raven == 5.32 .0
9
+ monsoon-upload-softlayer == 0.2.0
10
+ raven == 6.6 .0
11
11
softlayer-object-storage == 0.5.4
You can’t perform that action at this time.
0 commit comments