Use public Oracle XE images in Flowable Oracle Build

flowable · May 18, 2021 · 18c751f · 18c751f
1 parent f117102
commit 18c751f
Showing 1 changed file with 46 additions and 36 deletions.
diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml
@@ -1,6 +1,7 @@
 name: Flowable Oracle Build
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -15,30 +16,33 @@ jobs:
   test_oracle:
     name: Oracle ${{ matrix.oracle }}
     runs-on: ubuntu-latest
-    if: github.repository == 'flowable/flowable-engine'
     strategy:
       fail-fast: false
       matrix:
-        oracle: ["11.2.0.2-xe"]
+        oracle: [ "11-slim", "18" ]
         include:
-          - oracle: 11.2.0.2-xe
+          - oracle: 11-slim
             driverVersion: 11.2.0.4
             driverArtifact: ojdbc6
+            serviceName: XE
+          - oracle: 18
+            driverVersion: 18.3.0.0
+            driverArtifact: ojdbc8
+            serviceName: XEPDB1
     services:
       oracle:
-        image: artifacts.flowable.com/docker-local/infra/oracle:${{ matrix.oracle }}
-        credentials:
-          username: ${{ secrets.flowable_docker_user }}
-          password: ${{ secrets.flowable_docker_user_password }}
+        image: gvenzl/oracle-xe:${{ matrix.oracle }}
         env:
-          ORACLE_USER: flowable
-          ORACLE_USER_PASSWORD: flowable
+          ORACLE_PASSWORD: flowable
+          APP_USER: flowable
+          APP_USER_PASSWORD: flowable
         ports:
           - 1521/tcp
         options: >-
           --shm-size=2g
-          --health-interval 30s
-          --health-timeout 40s
+          --health-cmd healthcheck.sh
+          --health-interval 20s
+          --health-timeout 10s
           --health-retries 10
     steps:
       - uses: actions/checkout@v2
@@ -54,7 +58,7 @@ jobs:
           ./mvnw clean install
           ${MAVEN_ARGS}
           -PcleanDb,oracle
-          -Djdbc.url=jdbc:oracle:thin:@localhost:${{ job.services.oracle.ports[1521] }}/XE
+          -Djdbc.url=jdbc:oracle:thin:@localhost:${{ job.services.oracle.ports[1521] }}/${{ matrix.serviceName }}
           -Djdbc.username=flowable
           -Djdbc.password=flowable
           -Djdbc.driver=oracle.jdbc.driver.OracleDriver
@@ -64,30 +68,33 @@ jobs:
   test_oracle_dmn:
     name: Oracle ${{ matrix.oracle }} DMN
     runs-on: ubuntu-latest
-    if: github.repository == 'flowable/flowable-engine'
     strategy:
       fail-fast: false
       matrix:
-        oracle: [ "11.2.0.2-xe" ]
+        oracle: [ "11-slim", "18" ]
         include:
-          - oracle: 11.2.0.2-xe
+          - oracle: 11-slim
             driverVersion: 11.2.0.4
             driverArtifact: ojdbc6
+            serviceName: XE
+          - oracle: 18
+            driverVersion: 18.3.0.0
+            driverArtifact: ojdbc8
+            serviceName: XEPDB1
     services:
       oracle:
-        image: artifacts.flowable.com/docker-local/infra/oracle:${{ matrix.oracle }}
-        credentials:
-          username: ${{ secrets.flowable_docker_user }}
-          password: ${{ secrets.flowable_docker_user_password }}
+        image: gvenzl/oracle-xe:${{ matrix.oracle }}
         env:
-          ORACLE_USER: flowable
-          ORACLE_USER_PASSWORD: flowable
+          ORACLE_PASSWORD: flowable
+          APP_USER: flowable
+          APP_USER_PASSWORD: flowable
         ports:
           - 1521/tcp
         options: >-
           --shm-size=2g
-          --health-interval 30s
-          --health-timeout 40s
+          --health-cmd healthcheck.sh
+          --health-interval 20s
+          --health-timeout 10s
           --health-retries 10
     steps:
       - uses: actions/checkout@v2-beta
@@ -103,7 +110,7 @@ jobs:
           ./mvnw clean install
           ${MAVEN_ARGS}
           -Pdmn,oracle
-          -Djdbc.url=jdbc:oracle:thin:@localhost:${{ job.services.oracle.ports[1521] }}/XE
+          -Djdbc.url=jdbc:oracle:thin:@localhost:${{ job.services.oracle.ports[1521] }}/${{ matrix.serviceName }}
           -Djdbc.username=flowable
           -Djdbc.password=flowable
           -Djdbc.driver=oracle.jdbc.driver.OracleDriver
@@ -114,30 +121,33 @@ jobs:
   test_oracle_content:
     name: Oracle ${{ matrix.oracle }} Content
     runs-on: ubuntu-latest
-    if: github.repository == 'flowable/flowable-engine'
     strategy:
       fail-fast: false
       matrix:
-        oracle: [ "11.2.0.2-xe" ]
+        oracle: [ "11-slim", "18" ]
         include:
-          - oracle: 11.2.0.2-xe
+          - oracle: 11-slim
             driverVersion: 11.2.0.4
             driverArtifact: ojdbc6
+            serviceName: XE
+          - oracle: 18
+            driverVersion: 18.3.0.0
+            driverArtifact: ojdbc8
+            serviceName: XEPDB1
     services:
       oracle:
-        image: artifacts.flowable.com/docker-local/infra/oracle:${{ matrix.oracle }}
-        credentials:
-          username: ${{ secrets.flowable_docker_user }}
-          password: ${{ secrets.flowable_docker_user_password }}
+        image: gvenzl/oracle-xe:${{ matrix.oracle }}
         env:
-          ORACLE_USER: flowable
-          ORACLE_USER_PASSWORD: flowable
+          ORACLE_PASSWORD: flowable
+          APP_USER: flowable
+          APP_USER_PASSWORD: flowable
         ports:
           - 1521/tcp
         options: >-
           --shm-size=2g
-          --health-interval 30s
-          --health-timeout 40s
+          --health-cmd healthcheck.sh
+          --health-interval 20s
+          --health-timeout 10s
           --health-retries 10
     steps:
       - uses: actions/checkout@v2
@@ -153,7 +163,7 @@ jobs:
           ./mvnw clean install
           ${MAVEN_ARGS}
           -Pcontent,oracle
-          -Djdbc.url=jdbc:oracle:thin:@localhost:${{ job.services.oracle.ports[1521] }}/XE
+          -Djdbc.url=jdbc:oracle:thin:@localhost:${{ job.services.oracle.ports[1521] }}/${{ matrix.serviceName }}
           -Djdbc.username=flowable
           -Djdbc.password=flowable
           -Djdbc.driver=oracle.jdbc.driver.OracleDriver