Upgrade openjdk for flyway

adevinta · Mar 19, 2024 · f978fd6 · f978fd6
1 parent c68d844
commit f978fd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -19,14 +19,14 @@ FROM alpine:3.17.0
 
 WORKDIR /flyway
 
-RUN apk add --no-cache --update openjdk8-jre-base bash gettext libc6-compat
+RUN apk add --no-cache --update openjdk17-jre bash gettext libc6-compat
 
 ARG FLYWAY_VERSION=10.10.0
 
-RUN wget https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${FLYWAY_VERSION}/flyway-commandline-${FLYWAY_VERSION}.tar.gz \
+RUN wget -q https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${FLYWAY_VERSION}/flyway-commandline-${FLYWAY_VERSION}.tar.gz \
     && tar -xzf flyway-commandline-${FLYWAY_VERSION}.tar.gz --strip 1 \
     && rm flyway-commandline-${FLYWAY_VERSION}.tar.gz \
-    && find ./drivers/ -type f -not -name 'postgres*' -delete \
+    && find ./drivers/ -type f | grep -Ev '(postgres|jackson)' | xargs rm \
     && chown -R root:root . \
     && ln -s /flyway/flyway /bin/flyway
 

diff --git a/run.sh b/run.sh
@@ -2,6 +2,8 @@
 
 # Copyright 2022 Adevinta
 
+set -e
+
 # Apply env variables
 envsubst < config.toml > run.toml
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     # Copyright 2022 Adevinta
+    set -e
     # Apply env variables
     envsubst < config.toml > run.toml
@@ Expand Down @@