diff options
| -rw-r--r-- | buildSrc/settings.gradle.kts | 2 | ||||
| -rw-r--r-- | docker-compose.override.yml | 4 | ||||
| -rw-r--r-- | docker-compose.yml | 2 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 12 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | opendc-web/opendc-web-server/Dockerfile | 8 | ||||
| -rw-r--r-- | opendc-web/opendc-web-server/build.gradle.kts | 4 |
7 files changed, 24 insertions, 10 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/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/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: 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] 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 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") + } } } } |