Skip to content

Commit 8b849f7

Browse files
leonspreevejd
authored andcommitted
[1.0.0][] - 2018-04-06
- New mandatory parameter: `SOFTLAYER_NETWORK` to choose between `public` and `private` for upload. - Updated MySQL, Postgres, and MySQL modules. - Updated Sentry Raven from `5.32.0` to `6.6.0` - Fixed linter errors.
1 parent 4454ebe commit 8b849f7

File tree

4 files changed

+30
-14
lines changed

4 files changed

+30
-14
lines changed

CHANGELOG.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
66

77
## [Unreleased][]
88

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+
921
## [0.3.2][] - 2017-12-20
1022
### Fixed
1123
- Made plugins fail with non-zero status for backup errors
@@ -52,8 +64,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
5264
- Upload to Softlayer
5365
- Travis CI for continuous integration
5466

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
5769
[0.3.2]: https://github.ibm.com/bdu/gamora/compare/0.3.1...0.3.2
5870
[0.3.1]: https://github.ibm.com/bdu/gamora/compare/0.3.0...0.3.1
5971
[0.3.0]: https://github.ibm.com/bdu/gamora/compare/0.2.1...0.3.0

gamora/Dockerfile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ LABEL maintainer="[email protected]"
88

99
# Install database clients
1010
# Apply security patches
11+
# hadolint ignore=DL3018
1112
RUN echo 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
1213
&& echo 'http://dl-3.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
1314
&& apk add --no-cache \
1415
bash \
1516
libressl \
1617
mariadb-client \
1718
mongodb-tools \
19+
openldap \
1820
postgresql
1921

2022
ARG PIP_REPO_HOST_WITH_CREDS
@@ -27,19 +29,19 @@ RUN [[ -n "${PIP_REPO_HOST_WITH_CREDS:?}" ]] \
2729

2830
RUN mkdir /root/.pip
2931

30-
RUN printf "[global]\n\
32+
RUN printf '[global]\n\
3133
index-url = https://pypi.python.org/simple\n\
3234
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
3436

35-
RUN printf "[distutils]\n\
37+
RUN printf '[distutils]\n\
3638
index-servers = local\n\
3739
\n\
3840
[local]\n\
3941
repository:%s\n\
4042
username:%s\n\
4143
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" \
4345
> /root/.pypirc
4446

4547
RUN mkdir -p /gamora /gamora/pip
@@ -60,6 +62,7 @@ LABEL maintainer="[email protected]"
6062

6163
# Install database clients
6264
# Apply security patches
65+
# hadolint ignore=DL3018
6366
RUN echo 'http://dl-3.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
6467
&& echo 'http://dl-3.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
6568
&& apk add --no-cache \

gamora/docker-entrypoint.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ upload_backup() {
3838

3939
log "Uploading backup"
4040
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:?}" \
4546
"${BACKUP_PATH:?}/${filename:?}" \
4647
"${remote_path:?}/${filename:?}" \
4748
&& rm -f "${BACKUP_PATH:?}/${filename:?}"

gamora/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ httplib2==0.9.2
33
monsoon-cli==0.1.7
44
monsoon-backup-files==0.1.3
55
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
88
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
1111
softlayer-object-storage==0.5.4

0 commit comments

Comments
 (0)