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 33cebe9fe3508ddeaad59246d23bc17c7882206c
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sat Aug 10 09:29:24 2024 +0200
Simplifies website build
---
Dockerfile | 11 +++++++++++
Jenkinsfile | 4 +---
docker-arm64-serve.sh | 3 ++-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..36fc04f78
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,11 @@
+FROM ruby:3.2.5
+
+WORKDIR /var/jekyll
+
+COPY . .
+
+RUN gem install bundler jekyll
+
+CMD ["bundle", "exec", "jekyll", "serve", "--host=0.0.0.0", "--incremental"]
+
+EXPOSE 4000
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index 1d0201294..de4b794af 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,10 +21,8 @@ pipeline {
sh '''
echo Generating a new version of website
- gem install --install-dir ${GEM_HOME} bundler -v '2.3.23'
-
+ gem install --install-dir ${GEM_HOME} bundler jekyll
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..6563d02dc 100644
--- a/docker-arm64-serve.sh
+++ b/docker-arm64-serve.sh
@@ -1,3 +1,4 @@
#!/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
+docker build -t struts-jekyll .
+docker run --rm -v "$PWD:/var/jekyll" -p 4000:4000 -it struts-jekyll
