Merge pull request #25 from factorhouse/feature/pre-93

pre 93
factorhouse · Mar 18, 2024 · 849a124 · 849a124
2 parents 6fa398c + 31964c9
commit 849a124
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 19 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -242,6 +242,10 @@ jobs:
           IMAGE_TAG=latest
           ./scripts/build_all.sh $VERSION $IMAGE_ID $IMAGE_TAG dockerfile/kpow/Dockerfile
 
+      - name: Deploy OpenAPI spec
+        run: | 
+          aws cp target/kpow-enterprise-openapi.json s3://${ secrets.RELEASES_BUCKET }}/kpow-enterprise-openapi-${{github.event.inputs.version}}.json \
+          --cache-control no-cache --content-type application/json
       - name: Install babashka
         run: sudo bash < <(curl -s https://raw.githubusercontent.com/babashka/babashka/master/install)
       - name: Update releases-ee.edn
@@ -267,4 +271,4 @@ jobs:
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
+          branch: ${{ github.ref }}
diff --git a/dockerfile/alpine/Dockerfile b/dockerfile/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:11.0.21-alpine
+FROM amazoncorretto:11-alpine3.16
 
 ARG VERSION
 ARG RELEASE
@@ -19,4 +19,4 @@ ENV JVM_OPTS="-server -Dclojure.core.async.pool-size=$CORE_ASYNC_POOL_SIZE -XX:M
 
 EXPOSE 3000
 
-CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
+CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
diff --git a/dockerfile/aws-mkt-corp/Dockerfile b/dockerfile/aws-mkt-corp/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:11.0.21
+FROM amazoncorretto:11.0.22
 
 ARG VERSION
 ARG RELEASE
@@ -19,4 +19,4 @@ ENV JVM_OPTS="-server -Dclojure.core.async.pool-size=$CORE_ASYNC_POOL_SIZE -XX:M
 
 EXPOSE 3000
 
-CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
+CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
diff --git a/dockerfile/aws-mkt-lm/Dockerfile b/dockerfile/aws-mkt-lm/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:11.0.21
+FROM amazoncorretto:11.0.22
 
 ARG VERSION
 ARG RELEASE
@@ -19,4 +19,4 @@ ENV JVM_OPTS="-server -Dclojure.core.async.pool-size=$CORE_ASYNC_POOL_SIZE -XX:M
 
 EXPOSE 3000
 
-CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
+CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
diff --git a/dockerfile/aws-mkt-pro/Dockerfile b/dockerfile/aws-mkt-pro/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:11.0.21
+FROM amazoncorretto:11.0.22
 
 ARG VERSION
 ARG RELEASE
@@ -19,4 +19,4 @@ ENV JVM_OPTS="-server -Dclojure.core.async.pool-size=$CORE_ASYNC_POOL_SIZE -XX:M
 
 EXPOSE 3000
 
-CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
+CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
diff --git a/dockerfile/aws-mkt-team/Dockerfile b/dockerfile/aws-mkt-team/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:11.0.21
+FROM amazoncorretto:11.0.22
 
 ARG VERSION
 ARG RELEASE
@@ -19,4 +19,4 @@ ENV JVM_OPTS="-server -Dclojure.core.async.pool-size=$CORE_ASYNC_POOL_SIZE -XX:M
 
 EXPOSE 3000
 
-CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
+CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
diff --git a/dockerfile/jdk17/Dockerfile b/dockerfile/jdk17/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17.0.9
+FROM amazoncorretto:17.0.10
 
 ARG VERSION
 ARG RELEASE
@@ -28,4 +28,4 @@ ENV JVM_OPTS="-server -Dclojure.core.async.pool-size=$CORE_ASYNC_POOL_SIZE -XX:M
 
 EXPOSE 3000
 
-CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
+CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
diff --git a/dockerfile/kpow-ce/Dockerfile b/dockerfile/kpow-ce/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:17.0.9
+FROM amazoncorretto:17.0.10
 
 ARG VERSION
 ARG RELEASE
@@ -21,4 +21,4 @@ ENV JVM_OPTS="-server -Dclojure.core.async.pool-size=$CORE_ASYNC_POOL_SIZE -XX:M
 
 EXPOSE 3000
 
-CMD java $JVM_OPTS -jar /opt/kpow/lib/kpow.jar
+CMD java $JVM_OPTS -jar /opt/kpow/lib/kpow.jar
diff --git a/dockerfile/kpow/Dockerfile b/dockerfile/kpow/Dockerfile
@@ -1,4 +1,4 @@
-FROM amazoncorretto:11.0.21
+FROM amazoncorretto:11.0.22
 
 ARG VERSION
 ARG RELEASE
@@ -19,4 +19,4 @@ ENV JVM_OPTS="-server -Dclojure.core.async.pool-size=$CORE_ASYNC_POOL_SIZE -XX:M
 
 EXPOSE 3000
 
-CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
+CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
diff --git a/dockerfile/rh-ubi/Dockerfile b/dockerfile/rh-ubi/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.18-2
+FROM registry.access.redhat.com/ubi8/openjdk-11:1.19-1
 
 ARG VERSION
 ARG RELEASE
@@ -22,4 +22,4 @@ USER 1001
 ENV CORE_ASYNC_POOL_SIZE=8
 ENV JVM_OPTS="-server -Dclojure.core.async.pool-size=$CORE_ASYNC_POOL_SIZE -XX:MaxInlineLevel=15 -Djava.awt.headless=true -XX:InitialRAMPercentage=70 -XX:MaxRAMPercentage=70"
 
-CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar
+CMD java $JVM_OPTS -jar /opt/operatr/lib/kpow.jar