summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/build.yml14
-rw-r--r--gradle/libs.versions.toml2
-rw-r--r--opendc-web/opendc-web-runner/Dockerfile4
-rw-r--r--opendc-web/opendc-web-ui/build.gradle.kts4
4 files changed, 21 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a4dc27e..9cde7fbe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,3 +56,17 @@ jobs:
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./build/reports/jacoco/codeCoverageReport/codeCoverageReport.xml
+ build-docker:
+ name: Build Docker Images
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+ - name: Build Runner
+ uses: docker/build-push-action@v3
+ with:
+ file: opendc-web/opendc-web-runner/Dockerfile
+ - name: Build API
+ uses: docker/build-push-action@v3
+ with:
+ file: opendc-web/opendc-web-api/Dockerfile
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a7956ce3..a6eac3ed 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ clikt = "3.4.1"
config = "1.4.2"
commons-math3 = "3.6.1"
dokka = "1.6.10"
-gradle-node = "3.2.1"
+gradle-node = "3.3.0"
hadoop = "3.3.1"
jackson = "2.13.2"
jandex-gradle = "0.12.0"
diff --git a/opendc-web/opendc-web-runner/Dockerfile b/opendc-web/opendc-web-runner/Dockerfile
index 771ed2ed..b72f8a7f 100644
--- a/opendc-web/opendc-web-runner/Dockerfile
+++ b/opendc-web/opendc-web-runner/Dockerfile
@@ -9,10 +9,10 @@ RUN ./gradlew --version
# Build project
COPY ./ /app/
-RUN ./gradlew --no-daemon :installDist
+RUN ./gradlew --no-daemon :opendc-web:opendc-web-runner:installDist
FROM openjdk:17-slim
-COPY --from=0 /app/build/install /opt/
+COPY --from=0 /app/opendc-web/opendc-web-runner/build/install /opt/
COPY --from=0 /app/traces /opt/opendc/traces
WORKDIR /opt/opendc
CMD bin/opendc-web-runner
diff --git a/opendc-web/opendc-web-ui/build.gradle.kts b/opendc-web/opendc-web-ui/build.gradle.kts
index c0e3fcf6..f8c0a45b 100644
--- a/opendc-web/opendc-web-ui/build.gradle.kts
+++ b/opendc-web/opendc-web-ui/build.gradle.kts
@@ -38,6 +38,10 @@ sourceSets {
}
}
+node {
+ download.set(true)
+}
+
val formatTask = tasks.register<NpmTask>("format") {
args.set(listOf("run", "format"))
dependsOn(tasks.npmInstall)