From 633fa611da3b184a48de7f2fbb7a3e6e7ff0dc15 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Wed, 3 Aug 2022 14:56:54 +0200 Subject: build: Update to Gradle 7.5 This change updates the build system Gradle to version 7.5, which ships Kotlin 1.6.21. That is the same version currently used by OpenDC and should reduce the warning messages produced by Gradle due to version mismatches. --- buildSrc/settings.gradle.kts | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index 746d38f1..3bc93388 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -20,7 +20,7 @@ * SOFTWARE. */ -enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") +rootProject.name = "buildSrc" dependencyResolutionManagement { versionCatalogs { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index aa991fce..8049c684 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit v1.2.3 From ff1085c513e8025ceb7cf61cc151f18321fe0ca4 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Wed, 3 Aug 2022 15:07:20 +0200 Subject: build: Update simulator dependencies This change updates the simulator dependencies to the latest available version where possible. --- gradle/libs.versions.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4e81ff35..503d1549 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] -calcite = "1.30.0" +calcite = "1.31.0" clikt = "3.5.0" commons-math3 = "3.6.1" dokka = "1.6.21" -gradle-node = "3.3.0" +gradle-node = "3.4.0" hadoop = "3.3.3" jackson = "2.13.3" jandex-gradle = "0.13.2" @@ -13,16 +13,16 @@ jakarta-validation = "2.0.2" junit-jupiter = "5.8.2" kotlin = "1.6.21" kotlin-logging = "2.1.23" -kotlinx-coroutines = "1.6.3" +kotlinx-coroutines = "1.6.4" ktlint-gradle = "10.3.0" -log4j = "2.17.2" +log4j = "2.18.0" microprofile-openapi = "3.0" -mockk = "1.12.4" +mockk = "1.12.5" parquet = "1.12.3" progressbar = "0.9.3" quarkus = "2.11.1.Final" quarkus-junit5-mockk = "1.1.1" -sentry = "6.1.2" +sentry = "6.3.0" slf4j = "1.7.36" [libraries] -- cgit v1.2.3 From 75f9b2bbc7183af8716574d73a2a1c5d32db3287 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Wed, 3 Aug 2022 15:20:11 +0200 Subject: fix(web/server): Customize Auth0 settings during build time This change fixes the Dockerfile for the OpenDC web server by also providing the custom Auth0 configuration values during build time of the image. These settings cannot be changed during runtime, so we need to declare them in the Dockerfile. --- docker-compose.override.yml | 4 ++++ opendc-web/opendc-web-server/Dockerfile | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 86aff681..35a7feb8 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -13,6 +13,10 @@ services: build: context: . dockerfile: opendc-web/opendc-web-server/Dockerfile + args: + OPENDC_AUTH0_DOMAIN: ${OPENDC_AUTH0_DOMAIN:?No Auth0 domain specified} + OPENDC_AUTH0_AUDIENCE: ${OPENDC_AUTH0_AUDIENCE:?No Auth0 audience specified} + OPENDC_AUTH0_DOCS_CLIENT_ID: ${OPENDC_AUTH0_DOCS_CLIENT_ID} ports: - "8081:8080" environment: 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 -- cgit v1.2.3 From 041a57335320cda1cf4cc4417a56493a5c98b96a Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Wed, 3 Aug 2022 15:21:51 +0200 Subject: fix(web/server): Remove unused Auth0 runner configuration This change removes the unused Auth0 runner configuration from the Docker Compose configuration. Currently, it is marked as required, so Docker Compose will fail if these values are not specified. --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a6d6ce1d..65354e67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,8 +31,6 @@ services: OPENDC_AUTH0_DOMAIN: ${OPENDC_AUTH0_DOMAIN:?No Auth0 domain specified} OPENDC_AUTH0_AUDIENCE: ${OPENDC_AUTH0_AUDIENCE:?No Auth0 audience specified} OPENDC_API_URL: ${OPENDC_API_BASE_URL:-http://web:8080} - OPENDC_AUTH0_CLIENT_ID_RUNNER: ${OPENDC_AUTH0_CLIENT_ID_RUNNER:?No client id for runner} - OPENDC_AUTH0_CLIENT_SECRET_RUNNER: ${OPENDC_AUTH0_CLIENT_SECRET_RUNNER:?No client secret for runner} SENTRY_DSN: ${OPENDC_SERVER_SENTRY_DSN-} postgres: -- cgit v1.2.3 From f7c59a3e7b3c006d253a9206bd830493180fc81e Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Wed, 3 Aug 2022 15:39:40 +0200 Subject: build(web/server): Include sample traces in distribution This change updates the build script of the OpenDC web server to include the sample traces in the repository. --- opendc-web/opendc-web-server/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) 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") + } } } } -- cgit v1.2.3