diff --git a/Dockerfile b/Dockerfile index 8905153..a3f6c96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,28 @@ -FROM eclipse-temurin:17 AS builder +FROM eclipse-temurin:21 AS builder RUN apt-get -y update && apt-get install unzip WORKDIR /app # install ballerina -ARG BAL_VERSION="2201.8.6" +ARG BAL_VERSION="2201.10.2" RUN wget --no-verbose https://dist.ballerina.io/downloads/${BAL_VERSION}/ballerina-${BAL_VERSION}-swan-lake.zip -RUN unzip ballerina-${BAL_VERSION}-swan-lake +RUN unzip -q ballerina-${BAL_VERSION}-swan-lake ENV PATH="${PATH}:/app/ballerina-${BAL_VERSION}-swan-lake/bin" # install liquibase -RUN wget --no-verbose https://github.com/liquibase/liquibase/releases/download/v4.11.0/liquibase-4.11.0.zip -RUN unzip liquibase-4.11.0.zip -d /app/liquibase +RUN wget --no-verbose https://github.com/liquibase/liquibase/releases/download/v4.29.2/liquibase-4.29.2.zip +RUN unzip -q liquibase-4.29.2.zip -d /app/liquibase # copy files COPY . /app RUN bal build --observability-included -FROM eclipse-temurin:17-jre +FROM eclipse-temurin:21-jre LABEL org.opencontainers.image.source="https://github.com/UST-QuAntiL/qhana-backend" -RUN apt-get -y update && apt-get install -y sqlite3 unzip zip +RUN apt-get -y update && apt-get install -y sqlite3 unzip zip && rm -rf /var/lib/apt/lists/* WORKDIR /app diff --git a/start-docker.sh b/start-docker.sh index 15e994f..7587012 100644 --- a/start-docker.sh +++ b/start-docker.sh @@ -1,7 +1,8 @@ #!/bin/sh +LIQUIBASE_HUB_MODE=OFF # prepare sqlite database -liquibase --url=jdbc:sqlite:qhana-backend.db --classpath=/app --driver=org.sqlite.JDBC --changelog-file=changelog.xml --secure-parsing=false --hub-mode=off updateTestingRollback +liquibase --url=jdbc:sqlite:qhana-backend.db --classpath=/app --driver=org.sqlite.JDBC --changelog-file=changelog.xml --secure-parsing=false updateTestingRollback # insert env var for mariadb liquibase config cat << EOF > /app/liquibase.properties diff --git a/update-sqlite-db.sh b/update-sqlite-db.sh index b07f7cf..c51d0bc 100644 --- a/update-sqlite-db.sh +++ b/update-sqlite-db.sh @@ -1,9 +1,9 @@ #!/bin/bash # get sqlite driver for liquibase -JDBC=lib/sqlite-jdbc-3.36.0.3.jar +JDBC=lib/sqlite-jdbc-3.46.1.3.jar if [ ! -f "$JDBC" ]; then - wget -P lib https://github.com/xerial/sqlite-jdbc/releases/download/3.36.0.3/sqlite-jdbc-3.36.0.3.jar + wget -P lib https://github.com/xerial/sqlite-jdbc/releases/download/3.46.1.3/sqlite-jdbc-3.46.1.3.jar fi # set up db or deploy db changes