[struts-site] branch results updated: Moves building commands back to pipeline

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch results
in repository https://gitbox.apache.org/repos/asf/struts-site.git


The following commit(s) were added to refs/heads/results by this push:
     new 415ffd76f Moves building commands back to pipeline
415ffd76f is described below

commit 415ffd76fb7504c7d201622a102d98680877b51f
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Wed Oct 19 14:46:19 2022 +0200

    Moves building commands back to pipeline
---
 Dockerfile  | 6 ------
 Jenkinsfile | 7 ++++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7fc28be9d..e580a8dfc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,3 @@
 FROM jekyll/builder:4.2.2
 
 USER 910
-
-ENV GEM_HOME="$WORKSPACE/.gems"
-ENV PATH="$GEM_HOME/bin:$PATH"
-ENV BUNDLE_USER_HOME="$WORKSPACE/.bundle"
-
-RUN bundle config set --local path $GEM_HOME
diff --git a/Jenkinsfile b/Jenkinsfile
index 43f3c9e6a..b49771e7c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,11 +14,16 @@ pipeline {
     stage('Build a staged website') {
       agent {
         dockerfile {
-          args "-v ${env.WORKSPACE}:/dest:rw,z -e WORKSPACE=${env.WORKSPACE}"
+          args "-v ${env.WORKSPACE}:/dest:rw,z"
         }
       }
       steps {
         sh '''
+          export GEM_HOME="$WORKSPACE/.gems"
+          export PATH="$GEM_HOME/bin:$PATH"
+          export BUNDLE_USER_HOME="$WORKSPACE/.bundle"
+
+          bundle config set --local path $GEM_HOME
           bundle install
           bundle exec jekyll build
           mv ./_site /dest