Compare commits

...

19 Commits

Author SHA1 Message Date
c0671acf60 Merge pull request 'Update dependency org.xerial:sqlite-jdbc to v3.45.3.0' (#44) from renovate/org.xerial-sqlite-jdbc-3.x into master
Reviewed-on: #44
2024-04-23 11:58:14 +00:00
0b8300c774 Merge pull request 'Update dependency org.slf4j:slf4j-simple to v2.0.13' (#43) from renovate/slf4j-monorepo into master
Reviewed-on: #43
2024-04-23 11:58:05 +00:00
cac55d5f06 Merge pull request 'Update dependency commons-io:commons-io to v2.16.1' (#42) from renovate/commons-io-commons-io-2.x into master
Reviewed-on: #42
2024-04-23 11:57:55 +00:00
aa3aadbb53 Merge pull request 'Update dependency com.kohlschutter.junixsocket:junixsocket-core to v2.9.1' (#41) from renovate/com.kohlschutter.junixsocket-junixsocket-core-2.x into master
Reviewed-on: #41
2024-04-23 11:57:45 +00:00
12aa40b160 Update dependency org.xerial:sqlite-jdbc to v3.45.3.0 2024-04-16 04:01:50 +00:00
9d4fddcb2d Update dependency org.slf4j:slf4j-simple to v2.0.13 2024-04-12 15:01:46 +00:00
4654cff158 Update dependency commons-io:commons-io to v2.16.1 2024-04-08 18:01:40 +00:00
b1888fed96 Update dependency com.kohlschutter.junixsocket:junixsocket-core to v2.9.1 2024-04-05 16:01:34 +00:00
d7e8b3d62a Java 21 2024-04-02 18:02:39 +02:00
56bfdda18c Update Java 2024-04-02 17:57:00 +02:00
fb3debfb49 Replace apk with apt 2024-04-02 17:52:14 +02:00
49f812f867 Bump Java to 22 2024-04-02 17:45:01 +02:00
de0a3152c3 Bump JRE to 21 2024-04-02 16:08:59 +02:00
cc5d047c3f Merge pull request 'Update dependency com.googlecode.libphonenumber:libphonenumber to v8.13.34' (#40) from renovate/com.googlecode.libphonenumber-libphonenumber-8.x into master
Reviewed-on: #40
2024-04-02 13:54:24 +00:00
350776df17 Merge pull request 'Update dependency com.twilio.sdk:twilio to v10.1.3' (#39) from renovate/com.twilio.sdk-twilio-10.x into master
Reviewed-on: #39
2024-04-02 13:54:13 +00:00
7b6560e9c8 Merge pull request 'Update dependency commons-io:commons-io to v2.16.0' (#38) from renovate/commons-io-commons-io-2.x into master
Reviewed-on: #38
2024-04-02 13:54:00 +00:00
dfad9d9ce8 Update dependency com.googlecode.libphonenumber:libphonenumber to v8.13.34 2024-04-02 13:01:23 +00:00
d2fc4e3bef Update dependency com.twilio.sdk:twilio to v10.1.3 2024-04-01 11:01:26 +00:00
4416c17216 Update dependency commons-io:commons-io to v2.16.0 2024-03-28 23:01:26 +00:00
2 changed files with 24 additions and 14 deletions

View File

@@ -1,14 +1,23 @@
FROM --platform=$BUILDPLATFORM openjdk:8-jre-alpine AS builder # Use a specific version of OpenJDK based on Debian ("bullseye" in this case)
FROM --platform=$BUILDPLATFORM openjdk:21-jdk-bullseye AS builder
RUN apk update && apk add gradle git && rm -rf /var/lib/apk/* /var/cache/apk/* # Replace 'apk' commands with 'apt-get' for Debian-based package management.
# Install required packages such as 'git' and 'gradle'. Remember to update and clean up properly.
RUN apt-get update && \
apt-get install -y gradle git && \
rm -rf /var/lib/apt/lists/*
WORKDIR /mxids WORKDIR /mxids
COPY . . COPY . .
RUN ./gradlew shadowJar RUN ./gradlew shadowJar
FROM openjdk:8-jre-alpine # Second stage: Setup the runtime container
FROM openjdk:21-jdk-bullseye
RUN apk update && apk add bash && rm -rf /var/lib/apk/* /var/cache/apk/* # Again, switch to 'apt-get' for installing 'bash'. Clean up to keep the image size down.
RUN apt-get update && \
apt-get install -y bash && \
rm -rf /var/lib/apt/lists/*
VOLUME /etc/mxids VOLUME /etc/mxids
VOLUME /var/mxids VOLUME /var/mxids
@@ -19,8 +28,9 @@ ENV CONF_FILE_PATH="/etc/mxids/mxids.yaml"
ENV SIGN_KEY_PATH="/var/mxids/sign.key" ENV SIGN_KEY_PATH="/var/mxids/sign.key"
ENV SQLITE_DATABASE_PATH="/var/mxids/mxids.db" ENV SQLITE_DATABASE_PATH="/var/mxids/mxids.db"
CMD [ "/start.sh" ] # It's usually a good practice to use 'COPY' instead of 'ADD' for local files unless you need the extra capabilities of 'ADD' (like auto-extracting tar files).
COPY src/docker/start.sh /start.sh
ADD src/docker/start.sh /start.sh COPY src/script/mxids /app/mxids
ADD src/script/mxids /app/mxids
COPY --from=builder /mxids/build/libs/mxids.jar /app/mxids.jar COPY --from=builder /mxids/build/libs/mxids.jar /app/mxids.jar
CMD ["/start.sh"]

View File

@@ -90,10 +90,10 @@ repositories {
dependencies { dependencies {
// Logging // Logging
api 'org.slf4j:slf4j-simple:2.0.12' api 'org.slf4j:slf4j-simple:2.0.13'
// Easy file management // Easy file management
api 'commons-io:commons-io:2.15.1' api 'commons-io:commons-io:2.16.1'
// Config management // Config management
api 'org.yaml:snakeyaml:1.33' api 'org.yaml:snakeyaml:1.33'
@@ -119,7 +119,7 @@ dependencies {
api 'org.apache.httpcomponents:httpclient:4.5.14' api 'org.apache.httpcomponents:httpclient:4.5.14'
// Phone numbers validation // Phone numbers validation
api 'com.googlecode.libphonenumber:libphonenumber:8.13.33' api 'com.googlecode.libphonenumber:libphonenumber:8.13.34'
// E-mail sending // E-mail sending
api 'javax.mail:javax.mail-api:1.6.2' api 'javax.mail:javax.mail-api:1.6.2'
@@ -132,7 +132,7 @@ dependencies {
api 'com.mchange:c3p0:0.10.0' api 'com.mchange:c3p0:0.10.0'
// SQLite // SQLite
api 'org.xerial:sqlite-jdbc:3.45.2.0' api 'org.xerial:sqlite-jdbc:3.45.3.0'
// PostgreSQL // PostgreSQL
api 'org.postgresql:postgresql:42.7.3' api 'org.postgresql:postgresql:42.7.3'
@@ -141,10 +141,10 @@ dependencies {
api 'org.mariadb.jdbc:mariadb-java-client:3.3.3' api 'org.mariadb.jdbc:mariadb-java-client:3.3.3'
// UNIX sockets // UNIX sockets
api 'com.kohlschutter.junixsocket:junixsocket-core:2.9.0' api 'com.kohlschutter.junixsocket:junixsocket-core:2.9.1'
// Twilio SDK for SMS // Twilio SDK for SMS
api 'com.twilio.sdk:twilio:10.1.2' api 'com.twilio.sdk:twilio:10.1.3'
// SendGrid SDK to send emails from GCE // SendGrid SDK to send emails from GCE
api 'com.sendgrid:sendgrid-java:4.10.2' api 'com.sendgrid:sendgrid-java:4.10.2'