diff --git a/.github/workflows/deploy.prod.yml b/.github/workflows/deploy.prod.yml index 536a245d34..ed7d806def 100644 --- a/.github/workflows/deploy.prod.yml +++ b/.github/workflows/deploy.prod.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # fetch all tags, default 1 @@ -23,16 +23,16 @@ jobs: - run: echo ${{ steps.app_version.outputs.APP_VERSION }} - name: Login to Docker Hub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build Docker image and push to Docker Hub - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile diff --git a/Dockerfile b/Dockerfile index 1c01a1d3b5..f0d127680f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,8 @@ COPY collect-installation/docker/tomcat/conf/Catalina/localhost/collect.xml $CAT COPY collect-installation/docker/tomcat/bin/setenv.sh $CATALINA_HOME/bin/setenv.sh RUN chmod +x $CATALINA_HOME/bin/setenv.sh -ADD https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.40.0.0/sqlite-jdbc-3.40.0.0.jar $CATALINA_HOME/lib/ -ADD https://repo1.maven.org/maven2/org/postgresql/postgresql/42.5.1/postgresql-42.5.1.jar $CATALINA_HOME/lib/ -ADD https://repo1.maven.org/maven2/com/h2database/h2/2.1.214/h2-2.1.214.jar $CATALINA_HOME/lib/ +ADD https://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.46.1.0/sqlite-jdbc-3.46.1.0.jar $CATALINA_HOME/lib/ +ADD https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar $CATALINA_HOME/lib/ +ADD https://repo1.maven.org/maven2/com/h2database/h2/2.3.232/h2-2.3.232.jar $CATALINA_HOME/lib/ EXPOSE 8080 \ No newline at end of file diff --git a/pom.xml b/pom.xml index b529d16375..63a322d607 100644 --- a/pom.xml +++ b/pom.xml @@ -648,17 +648,17 @@ org.xerial sqlite-jdbc - 3.42.0.0 + 3.46.1.0 org.postgresql postgresql - 42.6.0 + 42.7.4 com.h2database h2 - 2.1.214 + 2.3.232 org.mockito