Skip to content

Commit 2878b85

Browse files
authored
Merge pull request #5 from cytopia/release-0.3
Release v0.3
2 parents 64dd98b + 2549247 commit 2878b85

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ before_script:
5959
script:
6060
# Push to docker hub on success
6161
- if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
62-
make login USER="${DOCKER_USERNAME}" PASS="${DOCKER_PASSWORD}";
62+
while ! make login USER="${DOCKER_USERNAME}" PASS="${DOCKER_PASSWORD}"; do sleep 1; done;
6363
if [ -n "${TRAVIS_TAG}" ]; then
64-
make push TAG="${VERSION}-${TRAVIS_TAG}";
64+
while ! make push TAG="${VERSION}-${TRAVIS_TAG}"; do sleep 1; done;
6565
elif [ "${TRAVIS_BRANCH}" == "master" ]; then
66-
make push TAG=${VERSION};
66+
while ! make push TAG=${VERSION}; do sleep 1; done;
6767
elif [[ ${TRAVIS_BRANCH} =~ ^(release-[.0-9]+)$ ]]; then
68-
make push TAG="${VERSION}-${TRAVIS_BRANCH}";
68+
while ! make push TAG="${VERSION}-${TRAVIS_BRANCH}"; do sleep 1; done;
6969
else
7070
echo "Skipping branch ${TRAVIS_BRANCH}";
7171
fi

Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ RUN set -x \
3939

4040
# Use a clean tiny image to store artifacts in
4141
FROM alpine:latest
42+
LABEL \
43+
maintainer="cytopia <cytopia@everythingcli.org>" \
44+
repo="https://github.com/cytopia/docker-terraform-docs"
4245
COPY --from=builder /go/src/github.com/segmentio/terraform-docs/bin/linux-amd64/terraform-docs /usr/local/bin/terraform-docs
4346
COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
4447

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,22 @@
99

1010
> #### All awesome CI images
1111
>
12+
> [ansible](https://github.com/cytopia/docker-ansible) |
1213
> [ansible-lint](https://github.com/cytopia/docker-ansible-lint) |
1314
> [awesome-ci](https://github.com/cytopia/awesome-ci) |
1415
> [jsonlint](https://github.com/cytopia/docker-jsonlint) |
1516
> [terraform-docs](https://github.com/cytopia/docker-terraform-docs) |
1617
> [yamllint](https://github.com/cytopia/docker-yamllint)
1718
1819

19-
[![Docker hub](http://dockeri.co/image/cytopia/terraform-docs)](https://hub.docker.com/r/cytopia/terraform-docs)
20+
View **[Dockerfile](https://github.com/cytopia/docker-terraform-docs/blob/master/Dockerfile)** on GitHub.
2021

22+
[![Docker hub](http://dockeri.co/image/cytopia/terraform-docs)](https://hub.docker.com/r/cytopia/terraform-docs)
2123

22-
Dockerized version of [terraform-docs](https://github.com/segmentio/terraform-docs)<sup>[1]</sup>,
24+
Tiny Alpine-based multistage-build dockerized version of [terraform-docs](https://github.com/segmentio/terraform-docs)<sup>[1]</sup>,
2325
which additionally implements `terraform-docs-replace` allowing you to automatically and safely
2426
replace the `terraform-docs` generated output infile.
27+
The image is built nightly against multiple stable versions and pushed to Dockerhub.
2528

2629
<sub>[1] Official project: https://github.com/segmentio/terraform-docs</sub>
2730

0 commit comments

Comments
 (0)