Merge branch 'main' into blog-objectmapper-mock-contstructor

.github/workflows/pr.yml

@@ -0,0 +1,16 @@
+name: PR build
+
+on: [pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: |
+          mkdir -p _site
+          ./go.sh build

docker/Dockerfile

@@ -0,0 +1,16 @@
+FROM ruby:2.7
+
+ENV BUNDLE_GEMFILE=/app/bundle/Gemfile
+
+WORKDIR /app/bundle
+
+ADD Gemfile .
+ADD Gemfile.lock .
+
+RUN bundle install
+
+RUN mkdir /app/src
+
+WORKDIR /app/src
+
+ENTRYPOINT ["bundle", "exec", "jekyll"]

Gemfile.lock → docker/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.16.1)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
     http_parser.rb (0.8.0)
     i18n (0.9.5)
@@ -89,4 +89,4 @@ DEPENDENCIES
   wdm (~> 0.1.0)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

go.sh

@@ -5,30 +5,32 @@ set -e
 export JEKYLL_VERSION=3.8
 
 goal_serve() {
-  docker run --rm \
-    --volume="$PWD:/srv/jekyll:Z" \
-    --volume="$PWD/vendor/bundle:/usr/local/bundle:Z" \
-    --env FORCE_POLLING=true \
-    -p 4000:4000 \
-    -p 40000:40000 \
-    -it jekyll/builder:$JEKYLL_VERSION \
-    jekyll serve --drafts --livereload --livereload_port 40000 --force_polling --incremental
+  goal_docker
+
+  docker run --rm -p 4000:4000 -p 40000:40000 -v $(pwd):/app/src jekyll-container serve\
+      --host 0.0.0.0 --drafts --livereload --livereload_port 40000 --force_polling
 }
 
 goal_build() {
-  docker run --rm \
-    --volume="$PWD:/srv/jekyll:Z" \
-    --volume="$PWD/vendor/bundle:/usr/local/bundle:Z" \
-    --env JEKYLL_ENV=production \
-    jekyll/builder:$JEKYLL_VERSION \
-    jekyll build
+  goal_docker
+  rm -rf _site
+  docker run --rm -p 4000:4000 -p 40000:40000 --env JEKYLL_ENV=production -v $(pwd):/app/src jekyll-container build
+
+
+}
+
+goal_docker() {
+  docker build -t jekyll-container docker
+
+  docker run --rm --entrypoint cat jekyll-container /app/bundle/Gemfile.lock > docker/Gemfile.lock
 }
 
 goal_help() {
   echo "usage: $0 <goal>
     available goals
     serve   -- serve the blog locally (http://localhost:4000)
     build   -- build the blog (builds static artifact for publishing)
+    docker  -- creates docker build image (tag: jekyll-container)
     "
   exit 1
 }