diff --git a/Dockerfile b/Dockerfile index 7186ab1..4232cb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM node:10.11-alpine -LABEL maintainer="Sander Bel " +LABEL maintainer="Nicholas Amorim " -ARG CRONICLE_VERSION='0.8.28' +ARG CRONICLE_VERSION='0.8.45' # Docker defaults ENV CRONICLE_base_app_url 'http://localhost:3012' @@ -10,7 +10,6 @@ ENV CRONICLE_WebServer__https_port 443 ENV CRONICLE_web_socket_use_hostnames 1 ENV CRONICLE_server_comm_use_hostnames 1 ENV CRONICLE_web_direct_connect 0 -ENV CRONICLE_socket_io_transports '["polling", "websocket"]' RUN apk add --no-cache git curl wget perl bash perl-pathtools tar \ procps tini diff --git a/Dockerfile.letsencrypt b/Dockerfile.letsencrypt deleted file mode 100644 index 47c01f6..0000000 --- a/Dockerfile.letsencrypt +++ /dev/null @@ -1,10 +0,0 @@ -FROM intelliops/cronicle:0.8.28 -LABEL maintainer="Sander Bel " - -USER root - -RUN curl https://letsencrypt.org/certs/lets-encrypt-x3-cross-signed.pem -o /usr/local/share/ca-certificates/LetsEncryptX3IdenTrust.crt && \ - chmod 644 /usr/local/share/ca-certificates/LetsEncryptX3IdenTrust.crt && \ - update-ca-certificates - -USER cronicle diff --git a/Dockerfile.s3 b/Dockerfile.s3 index e97d7ea..682b534 100644 --- a/Dockerfile.s3 +++ b/Dockerfile.s3 @@ -1,5 +1,5 @@ -FROM intelliops/cronicle:0.8.28 -LABEL maintainer="Sander Bel " +FROM nicholasamorim/cronicle:0.8.45 +LABEL maintainer="Nicholas Amorim " USER root diff --git a/README.md b/README.md index 8005b6f..0183043 100644 --- a/README.md +++ b/README.md @@ -3,20 +3,19 @@ Docker container for a Cronicle single-server master node +This image fixes a known issue with the intelliops/belsander image: https://github.com/belsander/docker-cronicle/issues/19 + # Supported tags -* `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`, `0.8.45`, [Dockerfile](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile) +* `latest-s3` , `0.8.45-s3`,[Dockerfile.s3](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile.s3) + +* `0.8.28` [Dockerfile](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile) +* `0.8.28-s3` [Dockerfile.s3](https://raw.githubusercontent.com/belsander/docker-cronicle/master/Dockerfile.s3) ## latest Latest version of Cronicle server based upon nodejs Docker image. -## letsencrypt -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`. @@ -25,12 +24,12 @@ there is no need for S3, again, just go for `latest`. ## Install ```sh -docker pull intelliops/cronicle:latest +docker pull nicholasamorim/cronicle:latest ``` ## Running ```sh -docker run --name cronicle --hostname localhost -p 3012:3012 intelliops/cronicle:latest +docker run --name cronicle --hostname localhost -p 3012:3012 nicholasamorim/cronicle:latest ``` Alternatively with persistent data and logs: @@ -38,7 +37,7 @@ Alternatively with persistent data and logs: docker run --name cronicle \ -v /path-to-cronicle-storage/data:/opt/cronicle/data:rw \ -v /path-to-cronicle-storage/logs:/opt/cronicle/logs:rw \ - --hostname localhost -p 3012:3012 intelliops/cronicle:latest + --hostname localhost -p 3012:3012 nicholasamorim/cronicle:latest ``` The web UI will be available at: http://localhost:3012 @@ -46,7 +45,7 @@ The web UI will be available at: http://localhost:3012 > NOTE: please replace the hostname `localhost`, this is only for testing > purposes! If you rename the hostname also consider setting the environmental > variable `CRONICLE_base_app_url`. -> e.g `docker run --name cronicle --hostname cronicle-host -p 3012:3012 -e CRONICLE_base_app_url='http://cronicle-host:3012' intelliops/cronicle:latest` +> e.g `docker run --name cronicle --hostname cronicle-host -p 3012:3012 -e CRONICLE_base_app_url='http://cronicle-host:3012' nicholasamorim/cronicle:latest` ## Volumes Cronicle process runs under the `cronicle` user with `ID 1001` and `GUID `1001`. If you are using Docker bind mounts set permissions accordingly.