From 45b8687e2209146a5afef09908ea471bae75856a Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Mon, 30 May 2022 16:52:11 +0200
Subject: [PATCH 01/14] fix image building on m1 processor

---
 Dockerfile     |  4 +++-
 README         | 14 +++++++++++---
 server.xml.tpl |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7fe15087e..55e656b6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN jruby -S bundler install --gemfile=/workspace/Gemfile \
 FROM tomcat:8.5-jre8
 LABEL maintainer "Johannes Wettinger <jowettinger@gmail.com>, Michael Wurster <miwurster@gmail.com>, Michael Hahn <mhahn.dev@gmail.com>"
 
-ARG DOCKERIZE_VERSION=v0.3.0
+ARG DOCKERIZE_VERSION=v0.6.1
 
 ENV TOMCAT_USERNAME admin
 ENV TOMCAT_PASSWORD admin
@@ -39,6 +39,8 @@ ADD server.xml.tpl ${CATALINA_HOME}/conf/server.xml.tpl
 ADD axis2.xml.tpl ${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml.tpl
 ADD log4j2.xml.tpl ${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml.tpl
 
+RUN mkdir ${CATALINA_HOME}/webapps/manager
+
 EXPOSE 9763
 
 CMD dockerize -template ${CATALINA_HOME}/conf/tomcat-users.xml.tpl:${CATALINA_HOME}/conf/tomcat-users.xml \
diff --git a/README b/README
index 69746cd4e..1cc722deb 100644
--- a/README
+++ b/README
@@ -1,6 +1,4 @@
-==============
-  Apache ODE
-==============
+# Apache ODE
 
 Apache ODE is a WS-BPEL compliant web services orchestration engine.
 It organizes web services calls following a process description
@@ -34,3 +32,13 @@ Finally here is a non exhaustive but representative features list:
  with virtually any communication layer or even embed it.
 
 
+## Docker
+### Build image on M1 Processor
+
+Clone the repo https://github.com/sathwik/docker-buildr go to the folder `jruby-jdk8` build the image with:
+
+`docker build -t sathwik/apache-buildr:latest-jruby-jdk8 .`
+
+Go to the ODE folder and build the image with:
+
+`docker build -t opentosca/ode:latest .`
diff --git a/server.xml.tpl b/server.xml.tpl
index 00abc4013..e24195655 100644
--- a/server.xml.tpl
+++ b/server.xml.tpl
@@ -90,7 +90,7 @@
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->
     <Connector port="8009" protocol="AJP/1.3" redirectPort="8443"
-               maxSwallowSize="-1" />
+               maxSwallowSize="-1" secretRequired="false" />
 
 
     <!-- An Engine represents the entry point (within Catalina) that processes

From f84e3a23e67136f2b55da042ab6f596b7b4d41b2 Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Tue, 31 May 2022 09:43:44 +0200
Subject: [PATCH 02/14] fix readme

---
 README => README.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README => README.md (100%)

diff --git a/README b/README.md
similarity index 100%
rename from README
rename to README.md

From 8b16bcb81414a0252391270135470d083e978eaa Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Wed, 22 Mar 2023 17:32:55 +0100
Subject: [PATCH 03/14] add GitHub workflow to build the docker image

---
 .github/workflows/docker_image.yml | 52 ++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 .github/workflows/docker_image.yml

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
new file mode 100644
index 000000000..7c0a97fe7
--- /dev/null
+++ b/.github/workflows/docker_image.yml
@@ -0,0 +1,52 @@
+name: Push docker images to the GitHub registry
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build_push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Checkout Apache Buildr
+        uses: actions/checkout@v3
+        repository: sathwik/docker-buildr
+        path: apache-buildr
+      - name: Build Apache Buildr
+        uses: docker/build-push-action@v4
+        with:
+          context: apache-buildr
+          platforms: linux/amd64,linux/arm64
+          load: true
+          tags: sathwik/apache-buildr:latest-jruby-jdk8
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to GitHub registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

From 6a601d96b158e6197f30a376ddaf4c99e5e8ae7b Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Wed, 22 Mar 2023 17:36:50 +0100
Subject: [PATCH 04/14] fix workflow

---
 .github/workflows/docker_image.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index 7c0a97fe7..c8dfa5bb2 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -20,8 +20,9 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Checkout Apache Buildr
         uses: actions/checkout@v3
-        repository: sathwik/docker-buildr
-        path: apache-buildr
+        with:
+          repository: sathwik/docker-buildr
+          path: apache-buildr
       - name: Build Apache Buildr
         uses: docker/build-push-action@v4
         with:

From 121b0859dd807f11103701e31e17795cc7f77425 Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Wed, 22 Mar 2023 17:39:29 +0100
Subject: [PATCH 05/14] fix path

---
 .github/workflows/docker_image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index c8dfa5bb2..db4bc7d58 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Build Apache Buildr
         uses: docker/build-push-action@v4
         with:
-          context: apache-buildr
+          context: apache-buildr/jruby-jdk8
           platforms: linux/amd64,linux/arm64
           load: true
           tags: sathwik/apache-buildr:latest-jruby-jdk8

From 63ff0e48440e92633581908f7e020cb4a0d6aa4d Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Wed, 22 Mar 2023 17:50:03 +0100
Subject: [PATCH 06/14] move buildx setup

---
 .github/workflows/docker_image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index db4bc7d58..f5f8bb87a 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -18,6 +18,8 @@ jobs:
         uses: actions/checkout@v3
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
       - name: Checkout Apache Buildr
         uses: actions/checkout@v3
         with:
@@ -35,8 +37,6 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
       - name: Login to GitHub registry
         uses: docker/login-action@v2
         with:

From 7e47ac9dfc92da1bcc02a4f7bf3c4450a7ba5148 Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Wed, 22 Mar 2023 17:59:03 +0100
Subject: [PATCH 07/14] try to fix buildx error

---
 .github/workflows/docker_image.yml | 12 +++++-
 Dockerfile-workflow                | 66 ++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 Dockerfile-workflow

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index f5f8bb87a..cdb86e941 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -29,9 +29,16 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: apache-buildr/jruby-jdk8
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
+          load: true
+          tags: sathwik/apache-buildr:linux/amd64
+      - name: Build Apache Buildr
+        uses: docker/build-push-action@v4
+        with:
+          context: apache-buildr/jruby-jdk8
+          platforms: linux/arm64
           load: true
-          tags: sathwik/apache-buildr:latest-jruby-jdk8
+          tags: sathwik/apache-buildr:linux/arm64
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4
@@ -47,6 +54,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
+          file: Dockerfile-workflow
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/Dockerfile-workflow b/Dockerfile-workflow
new file mode 100644
index 000000000..c85173464
--- /dev/null
+++ b/Dockerfile-workflow
@@ -0,0 +1,66 @@
+FROM sathwik/apache-buildr:$TARGETPLATFORM as builder
+
+ENV JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
+ENV BUILDR_ARGS="-f Rakefile clean package test=no JAVADOC=off"
+
+RUN apt-get update -qq && apt-get install -qqy \
+        unzip \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY . /workspace
+
+RUN jruby -S bundler install --gemfile=/workspace/Gemfile \
+    && buildr $BUILDR_ARGS \
+    && mkdir /build \
+    && cp /workspace/axis2-war/target/ode-axis2-war-1.3.8-SNAPSHOT.war /build/ode.war \
+    && unzip /build/ode.war -d /build/ode
+
+
+FROM tomcat:8.5-jre8
+LABEL maintainer "Johannes Wettinger <jowettinger@gmail.com>, Michael Wurster <miwurster@gmail.com>, Michael Hahn <mhahn.dev@gmail.com>"
+
+ARG DOCKERIZE_VERSION=v0.6.1
+
+ENV TOMCAT_USERNAME admin
+ENV TOMCAT_PASSWORD admin
+ENV ENGINE_PLAN_PORT 9763
+ENV LOG_LEVEL info
+
+RUN rm /dev/random && ln -s /dev/urandom /dev/random \
+    && wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+
+COPY --from=builder /build/ode ${CATALINA_HOME}/webapps/ode
+
+ADD tomcat-users.xml.tpl ${CATALINA_HOME}/conf/tomcat-users.xml.tpl
+ADD manager.xml ${CATALINA_HOME}/conf/Catalina/localhost/manager.xml
+ADD server.xml.tpl ${CATALINA_HOME}/conf/server.xml.tpl
+ADD axis2.xml.tpl ${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml.tpl
+ADD log4j2.xml.tpl ${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml.tpl
+
+RUN mkdir ${CATALINA_HOME}/webapps/manager
+
+EXPOSE 9763
+
+CMD dockerize -template ${CATALINA_HOME}/conf/tomcat-users.xml.tpl:${CATALINA_HOME}/conf/tomcat-users.xml \
+    -template ${CATALINA_HOME}/conf/server.xml.tpl:${CATALINA_HOME}/conf/server.xml \
+    -template ${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml.tpl:${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml \
+    -template ${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml.tpl:${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml \
+    ${CATALINA_HOME}/bin/catalina.sh run
+
+#
+# Manually build by running:
+#
+#   docker build -t opentosca/ode:local .
+# 
+# Run ODE container:
+# 
+#   docker run -d -p 9763:9763 --name ode opentosca/ode:local
+# 
+# Set a logging level different than "warn", e.g., for debugging process executions.
+# Possible values are: all, trace, debug, info, warn, error, fatal, off.
+# Visit Apache Log4j2 website for more details: https://logging.apache.org/log4j/2.x/.
+# 
+#   docker run -d -p 9763:9763 -e "LOG_LEVEL=debug" --name ode opentosca/ode:local
+# 

From 9cee6d0e7900d30816a6438dcb0905776a0d23e2 Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Wed, 22 Mar 2023 18:04:45 +0100
Subject: [PATCH 08/14] fix invalid tag

---
 .github/workflows/docker_image.yml | 4 ++--
 Dockerfile-workflow                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index cdb86e941..8549800b2 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -31,14 +31,14 @@ jobs:
           context: apache-buildr/jruby-jdk8
           platforms: linux/amd64
           load: true
-          tags: sathwik/apache-buildr:linux/amd64
+          tags: sathwik/apache-buildr:amd64
       - name: Build Apache Buildr
         uses: docker/build-push-action@v4
         with:
           context: apache-buildr/jruby-jdk8
           platforms: linux/arm64
           load: true
-          tags: sathwik/apache-buildr:linux/arm64
+          tags: sathwik/apache-buildr:arm64
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4
diff --git a/Dockerfile-workflow b/Dockerfile-workflow
index c85173464..29f46d800 100644
--- a/Dockerfile-workflow
+++ b/Dockerfile-workflow
@@ -1,4 +1,4 @@
-FROM sathwik/apache-buildr:$TARGETPLATFORM as builder
+FROM sathwik/apache-buildr:$TARGETARCH as builder
 
 ENV JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
 ENV BUILDR_ARGS="-f Rakefile clean package test=no JAVADOC=off"

From 1599a099bf46c33a3a3601dd843aebf84517465c Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Thu, 23 Mar 2023 09:29:35 +0100
Subject: [PATCH 09/14] add fix to the dockerfile of the apache builder image

---
 .github/workflows/docker_image.yml | 10 ++++++++--
 .github/workflows/fix.diff         |  7 +++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/fix.diff

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index 8549800b2..dd1c83ee9 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -25,14 +25,20 @@ jobs:
         with:
           repository: sathwik/docker-buildr
           path: apache-buildr
-      - name: Build Apache Buildr
+      - name: Fix dockerfile
+        run: |
+          cp .github/workflows/fix.diff apache-buildr/fix.diff
+          cd apache-buildr
+          git apply fix.diff
+          cd ..
+      - name: Build Apache Buildr for amd64
         uses: docker/build-push-action@v4
         with:
           context: apache-buildr/jruby-jdk8
           platforms: linux/amd64
           load: true
           tags: sathwik/apache-buildr:amd64
-      - name: Build Apache Buildr
+      - name: Build Apache Buildr for arm64
         uses: docker/build-push-action@v4
         with:
           context: apache-buildr/jruby-jdk8
diff --git a/.github/workflows/fix.diff b/.github/workflows/fix.diff
new file mode 100644
index 000000000..443f742fd
--- /dev/null
+++ b/.github/workflows/fix.diff
@@ -0,0 +1,7 @@
+diff --git a/jruby-jdk8/Dockerfile b/jruby-jdk8/Dockerfile
+index 53362e0..056be78 100644
+--- a/jruby-jdk8/Dockerfile
++++ b/jruby-jdk8/Dockerfile
+@@ -23 +23 @@ RUN echo 'gem: --no-rdoc --no-ri' >> /.gemrc
+-RUN gem install bundler
++RUN gem install bundler -v 2.3.26

From e8975396722653843995688533ecaceabe97cc3b Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Thu, 23 Mar 2023 09:38:22 +0100
Subject: [PATCH 10/14] fix git apply command

---
 .github/workflows/docker_image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index dd1c83ee9..e19c262bd 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -29,7 +29,7 @@ jobs:
         run: |
           cp .github/workflows/fix.diff apache-buildr/fix.diff
           cd apache-buildr
-          git apply fix.diff
+          git apply --unidiff-zero fix.diff
           cd ..
       - name: Build Apache Buildr for amd64
         uses: docker/build-push-action@v4

From dd03c737b03b409dfab73d69efdd8cc3a23579b4 Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Thu, 23 Mar 2023 10:12:24 +0100
Subject: [PATCH 11/14] debug

---
 .github/workflows/docker_image.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index e19c262bd..e9faacf3e 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -45,6 +45,8 @@ jobs:
           platforms: linux/arm64
           load: true
           tags: sathwik/apache-buildr:arm64
+      - name: List images # TODO: remove
+        run: docker image ls
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4

From 9addde4f63237d96f50692de2842c05479137ece Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Thu, 23 Mar 2023 10:48:34 +0100
Subject: [PATCH 12/14] add local image repository

---
 .github/workflows/docker_image.yml | 22 ++++++++++------------
 Dockerfile-workflow                |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index e9faacf3e..81b91fcde 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -13,6 +13,11 @@ env:
 jobs:
   build_push:
     runs-on: ubuntu-latest
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -20,6 +25,8 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
+        with:
+          driver-opts: network=host
       - name: Checkout Apache Buildr
         uses: actions/checkout@v3
         with:
@@ -35,18 +42,9 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: apache-buildr/jruby-jdk8
-          platforms: linux/amd64
-          load: true
-          tags: sathwik/apache-buildr:amd64
-      - name: Build Apache Buildr for arm64
-        uses: docker/build-push-action@v4
-        with:
-          context: apache-buildr/jruby-jdk8
-          platforms: linux/arm64
-          load: true
-          tags: sathwik/apache-buildr:arm64
-      - name: List images # TODO: remove
-        run: docker image ls
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: localhost:5000/sathwik/apache-buildr:latest-jruby-jdk8
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4
diff --git a/Dockerfile-workflow b/Dockerfile-workflow
index 29f46d800..3ff99864f 100644
--- a/Dockerfile-workflow
+++ b/Dockerfile-workflow
@@ -1,4 +1,4 @@
-FROM sathwik/apache-buildr:$TARGETARCH as builder
+FROM localhost:5000/sathwik/apache-buildr:latest-jruby-jdk8 as builder
 
 ENV JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
 ENV BUILDR_ARGS="-f Rakefile clean package test=no JAVADOC=off"

From 44a3cd834cad678b0ec0c4d4fc468aaf5f3197ea Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Thu, 23 Mar 2023 11:16:41 +0100
Subject: [PATCH 13/14] rename readme to fix file not found error

---
 .github/workflows/docker_image.yml | 2 +-
 README.md => README                | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename README.md => README (100%)

diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index 81b91fcde..4318eff68 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -38,7 +38,7 @@ jobs:
           cd apache-buildr
           git apply --unidiff-zero fix.diff
           cd ..
-      - name: Build Apache Buildr for amd64
+      - name: Build Apache Buildr
         uses: docker/build-push-action@v4
         with:
           context: apache-buildr/jruby-jdk8
diff --git a/README.md b/README
similarity index 100%
rename from README.md
rename to README

From fae196c8c4c7c8f27a9f735504a35fe5743230a4 Mon Sep 17 00:00:00 2001
From: Philipp Wundrack <philipp.wundrack@live.de>
Date: Fri, 24 Mar 2023 10:34:17 +0100
Subject: [PATCH 14/14] add Dockerfile of builder image

---
 .github/workflows/Dockerfile       | 59 ++++++++++++++++++++++++++++++
 .github/workflows/docker_image.yml | 13 +------
 .github/workflows/fix.diff         |  7 ----
 3 files changed, 60 insertions(+), 19 deletions(-)
 create mode 100644 .github/workflows/Dockerfile
 delete mode 100644 .github/workflows/fix.diff

diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
new file mode 100644
index 000000000..f2336b4d3
--- /dev/null
+++ b/.github/workflows/Dockerfile
@@ -0,0 +1,59 @@
+# Copyright 2023 University of Stuttgart
+
+# This file is a modified version of the original that can be found here:
+# https://github.com/sathwik/docker-buildr
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM openjdk:8
+
+MAINTAINER Sathwik B P
+
+ENV JRUBY_VERSION 9.1.12.0
+ENV BUILDR_VERSION 1.5.3
+ENV JRUBY_OPENSSL_VERSION 0.9.17
+ENV RSPEC-EXPECTATIONS 2.14.3
+ENV RSPEC-MOCKS 2.14.3
+ENV RSPEC-CORE 2.14.5
+ENV RSPEC 2.14.1
+ENV NOKOGIRI 1.6.8
+
+RUN mkdir /opt/jruby \
+  && curl http://jruby.org.s3.amazonaws.com/downloads/${JRUBY_VERSION}/jruby-bin-${JRUBY_VERSION}.tar.gz \
+  | tar -zxC /opt/jruby --strip-components=1 \
+  && update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1
+
+ENV PATH /opt/jruby/bin:$PATH
+
+RUN echo 'gem: --no-rdoc --no-ri' >> /.gemrc
+
+RUN gem install bundler -v 2.3.26
+RUN gem install jruby-openssl -v ${JRUBY_OPENSSL_VERSION}
+RUN gem install buildr -v ${BUILDR_VERSION}
+RUN gem install rspec-expectations -v ${RSPEC-EXPECTATIONS}
+RUN gem install rspec-mocks -v ${RSPEC-MOCKS}
+RUN gem install rspec-core -v ${RSPEC-CORE}
+RUN gem install rspec -v ${RSPEC}
+RUN gem install nokogiri -v ${NOKOGIRI}
+
+# make /tmp available to all users.
+RUN chmod 777 -R /tmp && chmod o+t -R /tmp
+
+RUN update-alternatives --install /usr/local/bin/buildr buildr /opt/jruby/bin/buildr 1 \
+&& update-alternatives --install /usr/local/bin/jruby jruby /opt/jruby/bin/jruby 1
+
+ENV WORKSPACE /workspace
+VOLUME /workspace
+WORKDIR /workspace
+
+ENTRYPOINT [ "buildr" ]
diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml
index 4318eff68..ca677cc2e 100644
--- a/.github/workflows/docker_image.yml
+++ b/.github/workflows/docker_image.yml
@@ -27,21 +27,10 @@ jobs:
         uses: docker/setup-buildx-action@v2
         with:
           driver-opts: network=host
-      - name: Checkout Apache Buildr
-        uses: actions/checkout@v3
-        with:
-          repository: sathwik/docker-buildr
-          path: apache-buildr
-      - name: Fix dockerfile
-        run: |
-          cp .github/workflows/fix.diff apache-buildr/fix.diff
-          cd apache-buildr
-          git apply --unidiff-zero fix.diff
-          cd ..
       - name: Build Apache Buildr
         uses: docker/build-push-action@v4
         with:
-          context: apache-buildr/jruby-jdk8
+          context: .github/workflows
           platforms: linux/amd64,linux/arm64
           push: true
           tags: localhost:5000/sathwik/apache-buildr:latest-jruby-jdk8
diff --git a/.github/workflows/fix.diff b/.github/workflows/fix.diff
deleted file mode 100644
index 443f742fd..000000000
--- a/.github/workflows/fix.diff
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git a/jruby-jdk8/Dockerfile b/jruby-jdk8/Dockerfile
-index 53362e0..056be78 100644
---- a/jruby-jdk8/Dockerfile
-+++ b/jruby-jdk8/Dockerfile
-@@ -23 +23 @@ RUN echo 'gem: --no-rdoc --no-ri' >> /.gemrc
--RUN gem install bundler
-+RUN gem install bundler -v 2.3.26