diff --git a/.drone.yml b/.drone.yml index b0080b6..8c51f6c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: settings: compose: docker-compose.prod.yml host: tcp://swarm.autonomic.zone:2376 - stack_name: autonomic-zone + stack_name: jekyll tlsverify: true environment: PLUGIN_CACERT: @@ -29,6 +29,3 @@ steps: trigger: branch: - master - event: - exclude: - - pull_request diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a1d879e..c4196ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,7 +51,3 @@ To stop the container when you're done, you can run: ```bash $ docker-compose stop ``` - -## Production - -Our [drone.autonomic.zone](https://drone.autonomic.zone/autonomic-cooperative/autonomic.zone/) configuration automatically deploys. diff --git a/Dockerfile b/Dockerfile index ada7353..f7864c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ EXPOSE 4000 RUN apk --no-cache add \ bash \ + curl \ g++ \ git \ make diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 753d618..cf5a55c 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,28 +1,30 @@ --- -version: "3.7" +version: "3.8" services: jekyll: image: decentral1se/autonomic.zone:v2.0.0 - command: jekyll serve --host 0.0.0.0 --trace + command: bundle exec jekyll serve --host 0.0.0.0 --trace environment: JEKYLL_ENV: production networks: - proxy + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:4000"] + interval: 15s + timeout: 10s + retries: 10 + start_period: 20s deploy: - mode: replicated - replicas: 1 update_config: failure_action: rollback - placement: - constraints: - - node.role == manager + order: start-first labels: - "traefik.enable=true" - "traefik.http.services.jekyll.loadbalancer.server.port=4000" - - "traefik.http.routers.jekyll.rule=Host(`site.swarm.autonomic.zone`)" + - "traefik.http.routers.jekyll.rule=Host(`autonomic.zone`)" - "traefik.http.routers.jekyll.entrypoints=web-secure" - - "traefik.http.routers.jekyll.tls.certresolver=staging" + - "traefik.http.routers.jekyll.tls.certresolver=production" networks: proxy: diff --git a/renovate.json b/renovate.json deleted file mode 100644 index 39a2b6e..0000000 --- a/renovate.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:base" - ] -}