Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
*
!build/*-runner
!build/*-runner.jar
!build/lib/*
!build/quarkus-app/*
Makefile
.gradle
.idea
.kotlin
.gitignore
LICENSE
*.md
Dockerfile
docker-compose.yml
1 change: 0 additions & 1 deletion CODEOWNERS

This file was deleted.

27 changes: 27 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
FROM registry.access.redhat.com/ubi9/openjdk-21 AS build
LABEL description="Wire Remind App"
LABEL project="wire-apps:reminder"

WORKDIR /setup

# Copy the entire project context for building
COPY . .

RUN ./gradlew clean build --no-daemon

FROM registry.access.redhat.com/ubi9/openjdk-21

ENV LANGUAGE='en_US:en'

# We make four distinct layers so if there are application changes the library layers can be re-used
COPY --chown=185 --from=build /setup/build/quarkus-app/lib/ /deployments/lib/
COPY --chown=185 --from=build /setup/build/quarkus-app/quarkus-run.jar /deployments/quarkus-run.jar
COPY --chown=185 --from=build /setup/build/quarkus-app/app/ /deployments/app/
COPY --chown=185 --from=build /setup/build/quarkus-app/quarkus/ /deployments/quarkus/

EXPOSE 8080
USER 185
ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"

ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies {
testImplementation("io.rest-assured:rest-assured")
}

group = "com.wire.bots"
group = "com.wire"
version = "1.0.0-SNAPSHOT"

java {
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
image: wirebots/reminders:latest
build:
context: ./
dockerfile: src/main/docker/Dockerfile.${QUARKUS_MODE:-jvm}
dockerfile: Dockerfile
environment:
QUARKUS_DATASOURCE_URL: jdbc:postgresql://db/quarkus
depends_on:
Expand Down
97 changes: 0 additions & 97 deletions src/main/docker/Dockerfile.jvm

This file was deleted.

95 changes: 0 additions & 95 deletions src/main/docker/Dockerfile.legacy-jar

This file was deleted.

27 changes: 0 additions & 27 deletions src/main/docker/Dockerfile.native

This file was deleted.

30 changes: 0 additions & 30 deletions src/main/docker/Dockerfile.native-micro

This file was deleted.

2 changes: 2 additions & 0 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ quarkus.log.handler.console."STRUCTURED_LOGGING".enable=true
quarkus.log.category."com.wire.integrations.jvm".use-parent-handlers=false
quarkus.log.category."com.wire.integrations.jvm".level=DEBUG
quarkus.log.category."com.wire.integrations.jvm".handlers=STRUCTURED_LOGGING
quarkus.log.category."io.ktor".min-level=TRACE
quarkus.log.category."io.ktor".level=TRACE