From c8af39cfadfe8a41418bed05a5df185c86358b4b Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 14 Sep 2019 21:40:08 +0200 Subject: [PATCH] we don't need our own Docker image --- Dockerfile | 7 ------- jekyll-admin_build.sh | 3 --- jekyll-admin_run.sh | 3 ++- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 Dockerfile delete mode 100755 jekyll-admin_build.sh diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 7bd2c87..0000000 --- a/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -FROM jekyll/builder:3.8 - -RUN set -e \ - && apk update \ - && apk add mariadb-connector-c-dev \ - && gem install jekyll-admin \ - && gem install jekyll-import sequel unidecode mysql2 htmlentities ## this is only needed for import from wordpress diff --git a/jekyll-admin_build.sh b/jekyll-admin_build.sh deleted file mode 100755 index 11b5927..0000000 --- a/jekyll-admin_build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -exec sudo docker build -t realraum/homepage . diff --git a/jekyll-admin_run.sh b/jekyll-admin_run.sh index a62d0ed..4c27407 100755 --- a/jekyll-admin_run.sh +++ b/jekyll-admin_run.sh @@ -1,4 +1,5 @@ #!/bin/bash BASE_D=$(realpath "${BASH_SOURCE%/*}/") +JEKYLL_VERSION=3.8 -exec sudo docker run --name realraum-jekyll --rm -it -p 127.0.0.1:4000:4000 --volume="$BASE_D/vendor/bundle:/usr/local/bundle" -v "$BASE_D/src":/srv/jekyll -v "$BASE_D/out":/srv/out realraum/homepage "$@" +exec sudo docker run --name realraum-jekyll --rm -it -p 127.0.0.1:4000:4000 --volume="$BASE_D/vendor/bundle:/usr/local/bundle" -v "$BASE_D/src":/srv/jekyll -v "$BASE_D/out":/srv/out jekyll/jekyll:$JEKYLL_VERSION "$@" -- 1.7.10.4