Fix docker (#6013)

* update docker stuff

* finalize docker fix

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"]

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']

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:

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:

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:

docs/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+jekyll serve --future --config _config_dev.yml -H 0.0.0.0 -P 4000 ${JEKYLLARGS}