This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch fix/jekyll
in repository https://gitbox.apache.org/repos/asf/struts-site.git
commit 215416c8650b765566c25a34f1428fd834d1b261
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sat Aug 10 09:29:24 2024 +0200
Simplifies website build
---
Dockerfile | 12 ++++++++++++
Gemfile | 1 +
Jenkinsfile | 1 -
docker-arm64-serve.sh | 5 ++++-
4 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..a3a31c927
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+FROM ruby:2.5.0
+
+WORKDIR /var/jekyll
+
+COPY . .
+
+RUN gem install bundler -v '2.3.23'
+RUN bundle install
+
+CMD ["bundle", "exec", "jekyll", "serve", "--host=0.0.0.0", "--incremental"]
+
+EXPOSE 4000
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 0bd62a919..3eef74c07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,5 @@
source "https://rubygems.org";
+gem "ffi", "< 1.17.0" #
https://github.com/ffi/ffi/issues/1103#issuecomment-2186974923
gem "jekyll"
gem "json"
diff --git a/Jenkinsfile b/Jenkinsfile
index 1d0201294..ee06965dd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,7 +22,6 @@ pipeline {
echo Generating a new version of website
gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
-
bundle config set --local path ${GEM_HOME}
bundle install
bundle exec jekyll build
diff --git a/docker-arm64-serve.sh b/docker-arm64-serve.sh
index 9cdf262ca..d2521667c 100644
--- a/docker-arm64-serve.sh
+++ b/docker-arm64-serve.sh
@@ -1,3 +1,6 @@
#!/bin/sh
-docker run --rm -v "$PWD:/var/jekyll" -p 4000:4000 -it
mrxder/jekyll-docker-arm64:latest jekyll serve --host=0.0.0.0 --incremental
+rm Gemfile.lock
+
+docker build -t struts-jekyll .
+docker run --rm -v "$PWD:/var/jekyll" -p 4000:4000 -it struts-jekyll
