From f58fe670d932f3dc05df73bad9abc0dcb58fe4f4 Mon Sep 17 00:00:00 2001
From: Tom Willemse <tom@ryuslash.org>
Date: Fri, 9 Oct 2020 23:07:55 -0700
Subject: [PATCH] Run stages using different container images

The Build/HTML stage needs the Emacs image because it uses Emacs to convert the
org files into html files. The Build/CSS stage runs in an image defined by the
Dockerfile in this repository, installing just make, npm, and lessc to convert
the less files into CSS files. And the Deploy step needs to upload using rsync
overs ssh.
---
 Dockerfile  |  6 ++----
 Jenkinsfile | 42 +++++++++++++++++++++++++++++++-----------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0b18c08..030869c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,3 @@
-FROM silex/emacs:27.1-alpine-dev
+FROM alpine:3.12
 
-RUN git clone https://github.com/cask/cask.git /usr/local/cask
-ENV PATH="/usr/local/cask/bin:$PATH"
-RUN cask upgrade-cask
+RUN apk add --no-cache make npm && npm -g install less
diff --git a/Jenkinsfile b/Jenkinsfile
index 72e4c97..fd6c7ae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,23 +1,43 @@
 pipeline {
-    agent {
-        docker {
-            image 'silex/emacs:27.1-alpine-dev'
-            args '-u root --privileged'
-        }
-    }
-
     stages {
         stage('Build') {
-            steps {
-                sh 'cask'
-                sh 'make'
-                stash includes: 'public/*', name: 'public_html'
+            parallel {
+                stage('HTML') {
+                    agent {
+                        docker {
+                            image 'silex/emacs:27.1-alpine-dev'
+                            args '-u root --privileged'
+                        }
+                    }
+
+                    steps {
+                        sh 'cask'
+                        sh 'make html'
+                        stash includes: 'public/*', name: 'public_html'
+                    }
+                }
+
+                stage('CSS') {
+                    agent { dockerfile true }
+
+                    steps {
+                        sh 'make css'
+                        stash includes: 'public/*', name: 'public_css'
+                    }
+                }
             }
         }
 
         stage('Deploy') {
+            agent {
+                docker {
+                    image 'instrumentisto/rsync-ssh'
+                }
+            }
+
             steps {
                 unstash 'public_html'
+                unstash 'public_css'
 
                 withCredentials([file(credentialsId: 'ryuslash.org-deploy-key', variable: 'KEY_FILE')]) {
                     sh 'rsync -e "ssh -p 4511 -i $KEY_FILE" -v -c -r --delete public/ "site@ryuslash.org:public_html/"'