Skip to content

Commit d9d4add

Browse files
authored
chore: WPB-19639 Migrate to JDK21
2 parents e2dca68 + 159d1d8 commit d9d4add

File tree

10 files changed

+40
-257
lines changed

10 files changed

+40
-257
lines changed

.dockerignore

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
*
2-
!build/*-runner
3-
!build/*-runner.jar
4-
!build/lib/*
5-
!build/quarkus-app/*
1+
Makefile
2+
.gradle
3+
.idea
4+
.kotlin
5+
.gitignore
6+
LICENSE
7+
*.md
8+
Dockerfile
9+
docker-compose.yml

CODEOWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.

Dockerfile

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
FROM registry.access.redhat.com/ubi9/openjdk-21 AS build
2+
LABEL description="Wire Remind App"
3+
LABEL project="wire-apps:reminder"
4+
5+
WORKDIR /setup
6+
7+
# Copy the entire project context for building
8+
COPY . .
9+
10+
RUN ./gradlew clean build --no-daemon
11+
12+
FROM registry.access.redhat.com/ubi9/openjdk-21
13+
14+
ENV LANGUAGE='en_US:en'
15+
16+
# We make four distinct layers so if there are application changes the library layers can be re-used
17+
COPY --chown=185 --from=build /setup/build/quarkus-app/lib/ /deployments/lib/
18+
COPY --chown=185 --from=build /setup/build/quarkus-app/quarkus-run.jar /deployments/quarkus-run.jar
19+
COPY --chown=185 --from=build /setup/build/quarkus-app/app/ /deployments/app/
20+
COPY --chown=185 --from=build /setup/build/quarkus-app/quarkus/ /deployments/quarkus/
21+
22+
EXPOSE 8080
23+
USER 185
24+
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
25+
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
26+
27+
ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ dependencies {
6262
testImplementation("io.rest-assured:rest-assured")
6363
}
6464

65-
group = "com.wire.bots"
65+
group = "com.wire"
6666
version = "1.0.0-SNAPSHOT"
6767

6868
java {

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
image: wirebots/reminders:latest
66
build:
77
context: ./
8-
dockerfile: src/main/docker/Dockerfile.${QUARKUS_MODE:-jvm}
8+
dockerfile: Dockerfile
99
environment:
1010
QUARKUS_DATASOURCE_URL: jdbc:postgresql://db/quarkus
1111
depends_on:

src/main/docker/Dockerfile.jvm

Lines changed: 0 additions & 97 deletions
This file was deleted.

src/main/docker/Dockerfile.legacy-jar

Lines changed: 0 additions & 95 deletions
This file was deleted.

src/main/docker/Dockerfile.native

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/main/docker/Dockerfile.native-micro

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/main/resources/application.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ quarkus.log.handler.console."STRUCTURED_LOGGING".enable=true
2424
quarkus.log.category."com.wire.integrations.jvm".use-parent-handlers=false
2525
quarkus.log.category."com.wire.integrations.jvm".level=DEBUG
2626
quarkus.log.category."com.wire.integrations.jvm".handlers=STRUCTURED_LOGGING
27+
quarkus.log.category."io.ktor".min-level=TRACE
28+
quarkus.log.category."io.ktor".level=TRACE

0 commit comments

Comments
 (0)