Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/docker/docker/database/master/m…
Browse files Browse the repository at this point in the history
…ysql-8.2.0
  • Loading branch information
dabico authored Oct 31, 2023
2 parents 58268ac + 4f5608e commit 386caae
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker/backup/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tiredofit/db-backup:3.11.0
FROM tiredofit/db-backup:3.11.1

RUN apk update --quiet
RUN apk add --no-cache \
Expand Down
2 changes: 1 addition & 1 deletion docker/website/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN for file in html/js/*.js; \
do uglifyjs --compress --mangle --webkit -- $file | sponge $file; \
done

FROM nginx:1.25.2-alpine-slim
FROM nginx:1.25.3-alpine-slim

COPY --from=build html /usr/share/nginx/html

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.release>17</java.release>
<java.version>1.${java.release}</java.version>
<kotlin.version>1.9.10</kotlin.version>
<kotlin.version>1.9.20</kotlin.version>
<guava.version>32.1.3-jre</guava.version>
<jackson.version>2.15.3</jackson.version>
<okhttp.version>4.12.0</okhttp.version>
<springboot.version>2.7.17</springboot.version>
<springbootadmin.version>2.7.11</springbootadmin.version>
<springbootadmin.version>2.7.12</springbootadmin.version>
</properties>

<dependencyManagement>
Expand Down

0 comments on commit 386caae

Please sign in to comment.