summaryrefslogtreecommitdiff
path: root/opendc-web/opendc-web-server
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2022-08-03 16:46:10 +0200
committerGitHub <noreply@github.com>2022-08-03 16:46:10 +0200
commit8a94318aad4b4fa188ac49e887d564867a00111e (patch)
tree4d60329dd591ffd46edaba23cd77e6df685c0312 /opendc-web/opendc-web-server
parent2692a032b8ecbe2ddccfb88628cf37af56c3ea36 (diff)
parentf7c59a3e7b3c006d253a9206bd830493180fc81e (diff)
merge: Update build and runtime dependencies (#94)
This pull request updates the build and runtime dependencies used by OpenDC to their latest version compatible with the project. ## Implementation Notes :hammer_and_pick: * Update to Gradle 7.5 * Update simulator dependency versions * Fix Docker deployment ## Breaking API Changes :warning: * N/A
Diffstat (limited to 'opendc-web/opendc-web-server')
-rw-r--r--opendc-web/opendc-web-server/Dockerfile8
-rw-r--r--opendc-web/opendc-web-server/build.gradle.kts4
2 files changed, 12 insertions, 0 deletions
diff --git a/opendc-web/opendc-web-server/Dockerfile b/opendc-web/opendc-web-server/Dockerfile
index 444d787e..5828e5c9 100644
--- a/opendc-web/opendc-web-server/Dockerfile
+++ b/opendc-web/opendc-web-server/Dockerfile
@@ -8,6 +8,14 @@ WORKDIR /app
RUN ./gradlew --version
# Build project
+ARG OPENDC_AUTH0_DOMAIN
+ARG OPENDC_AUTH0_AUDIENCE
+ARG OPENDC_AUTH0_DOCS_CLIENT_ID
+
+ENV OPENDC_AUTH0_DOMAIN=$OPENDC_AUTH0_DOMAIN
+ENV OPENDC_AUTH0_AUDIENCE=$OPENDC_AUTH0_AUDIENCE
+ENV OPENDC_AUTH0_DOCS_CLIENT_ID=$OPENDC_AUTH0_DOCS_CLIENT_ID
+
COPY ./ /app/
RUN ./gradlew --no-daemon :opendc-web:opendc-web-server:quarkusBuild -Dquarkus.profile=docker
diff --git a/opendc-web/opendc-web-server/build.gradle.kts b/opendc-web/opendc-web-server/build.gradle.kts
index a55df2f7..714ab066 100644
--- a/opendc-web/opendc-web-server/build.gradle.kts
+++ b/opendc-web/opendc-web-server/build.gradle.kts
@@ -84,6 +84,10 @@ distributions {
from(tasks.quarkusBuild) {
into("lib")
}
+
+ from("../../traces") {
+ into("traces")
+ }
}
}
}