From 9e14a73b3c69aed7dc95998df0f885da25736054 Mon Sep 17 00:00:00 2001 From: Jo David Date: Wed, 3 Jan 2018 20:31:30 +0100 Subject: [PATCH] Fix docker (#6013) * update docker stuff * finalize docker fix --- docs/Dockerfile | 19 ++++--------------- docs/Gemfile | 8 +------- docs/_config.yml | 2 +- docs/_config_dev.yml | 4 +--- docs/docker-compose.yml | 10 +++++++--- docs/entrypoint.sh | 3 +++ 6 files changed, 17 insertions(+), 29 deletions(-) create mode 100644 docs/entrypoint.sh diff --git a/docs/Dockerfile b/docs/Dockerfile index 033cd89d67..d8ae94bc6a 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -1,17 +1,6 @@ -# Build: -# docker build -t ace3mod/jekyll . -# -# Run: -# docker run -it -p 4000:4000 -v $(pwd):/usr/src/app ace3mod/jekyll -# -# Run with --incremental flag: -# docker run -it -p 4000:4000 -v $(pwd):/usr/src/app ace3mod/jekyll --incremental +FROM phpcommunity/github-pages +LABEL maintainer "bux" -FROM starefossen/github-pages:latest -MAINTAINER bux +COPY ./entrypoint.sh /usr/src/app -COPY . /usr/src/app - -VOLUME "/usr/src/app" - -ENTRYPOINT ["jekyll", "serve", "--future", "--config", "_config_dev.yml", "-H", "0.0.0.0", "-P", "4000"] +ENTRYPOINT ["./entrypoint.sh"] diff --git a/docs/Gemfile b/docs/Gemfile index a760185427..053c27dc35 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -1,8 +1,2 @@ -source 'http://rubygems.org' - -#require 'json' -#require 'open-uri' -#versions = JSON.parse(open('http://pages.github.com/versions.json').read) - +source 'https://rubygems.org' gem 'github-pages' -#, versions['github-pages'] diff --git a/docs/_config.yml b/docs/_config.yml index 0fda565889..5ac452807f 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -36,7 +36,7 @@ lsi: false exclude: [src, .editorconfig, .gitignore, CNAME, Gemfile, Gemfile.lock, README.md] -gems: +plugins: - jekyll-redirect-from whitelist: diff --git a/docs/_config_dev.yml b/docs/_config_dev.yml index 29e559c5fb..0e628a37bd 100644 --- a/docs/_config_dev.yml +++ b/docs/_config_dev.yml @@ -1,5 +1,3 @@ -#baseurl: /ACE3 - name: ACE3 description: ACE3 is a joint effort by the teams behind ACE 2, AGM and CSE to improve the realism and authenticity of Arma 3. keywords: Advanced Combat Enhancement 3, ACE, ACE3, Arma, Arma 3, Mod, Modification, Realism, AGM, CSE, Bohemia, Interactive @@ -38,7 +36,7 @@ lsi: false exclude: [src, .editorconfig, .gitignore, CNAME, Gemfile, Gemfile.lock, README.md] -gems: +plugins: - jekyll-redirect-from whitelist: diff --git a/docs/docker-compose.yml b/docs/docker-compose.yml index 9999a5b6e8..0795ef1b5c 100644 --- a/docs/docker-compose.yml +++ b/docs/docker-compose.yml @@ -1,9 +1,13 @@ -version: '2' +version: "3.2" services: docs: - build: . - restart: always + container_name: ace3mod_jekyll + build: + context: . + dockerfile: Dockerfile + environment: + - JEKYLLARGS=--incremental ports: - "4000:4000" volumes: diff --git a/docs/entrypoint.sh b/docs/entrypoint.sh new file mode 100644 index 0000000000..d15c7f7baa --- /dev/null +++ b/docs/entrypoint.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +jekyll serve --future --config _config_dev.yml -H 0.0.0.0 -P 4000 ${JEKYLLARGS}