Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added S3 support, no credentials or configuration yet #13

Merged
merged 2 commits into from
Oct 6, 2018
Merged

Added S3 support, no credentials or configuration yet #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21b65f3
Added S3 support, no credentials or configuration yet
intelliops Oct 6, 2018
7f3dad5
Updated documentation
intelliops Oct 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,19 @@ services:
install:
- docker build -t intelliops/cronicle:latest -f Dockerfile .
- docker build -t intelliops/cronicle-letsencrypt:latest -f Dockerfile.letsencrypt .
- docker build -t intelliops/cronicle-s3:latest -f Dockerfile.s3 .
- docker run --name cronicle -d -p 127.0.0.1:3012:3012 intelliops/cronicle:latest
- docker run --name cronicle-letsencrypt -d -p 127.0.0.1:4012:3012 intelliops/cronicle-letsencrypt:latest
- docker run --name cronicle-s3 -d -p 127.0.0.1:5012:3012 intelliops/cronicle-s3:latest

script:
- docker ps -a
- sleep 20
- docker exec cronicle /bin/ash -c "cat /opt/cronicle/conf/config.json"
- docker exec cronicle-letsencrypt /bin/ash -c "cat /opt/cronicle/conf/config.json"
- docker exec cronicle-s3 /bin/ash -c "cat /opt/cronicle/conf/config.json"
- curl http://localhost:3012 | grep LICENSE
- curl http://localhost:4012 | grep LICENSE
- docker stop cronicle cronicle-letsencrypt
- docker rm -f cronicle cronicle-letsencrypt
- curl http://localhost:5012 | grep LICENSE
- docker stop cronicle cronicle-letsencrypt cronicle-s3
- docker rm -f cronicle cronicle-letsencrypt cronicle-s3
5 changes: 5 additions & 0 deletions Dockerfile.s3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM intelliops/cronicle:latest
LABEL maintainer="Sander Bel <[email protected]>"

# Amazon S3
RUN npm install aws-sdk
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Docker container for a Cronicle single-server master node

* `0.8.28`, `latest` [Dockerfile](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile)
* `0.8.28-letsencrypt`, `letsencrypt` [Dockerfile.letsencrypt](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile.letsencrypt)
* `0.8.28-s3`, `s3` [Dockerfile.s3](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile.s3)

## latest
Latest version of Cronicle server based upon nodejs Docker image.
Expand All @@ -16,6 +17,10 @@ Same as the `latest` Docker image, but with support for Let's Encrypt
certificates. Which means that the Cronicle server can be used with SSL and a
Let's Encrypt certificate. If this is not needed, just use the tag `latest`.

## s3
Same as the `latest` Docker image, but with support for Amazon S3 storage. If
there is no need for S3, again, just go for `latest`.

# Usage

## Install
Expand Down