summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2022-05-15 21:48:32 +0200
committerGitHub <noreply@github.com>2022-05-15 21:48:32 +0200
commite35d7c49856d8fb5965a315976ac6fdd6c9fb718 (patch)
tree1d34c185a02b29f3faa871607cc24eecbf5d2f15
parent8a772cf16457fb703ad468c3f06b02ca045e5ec4 (diff)
parent3908391fd67da33df2d43c1b01a9e1709dd73c05 (diff)
merge: Build Docker images for build pipeline (#85)
This pull request updates the CI build pipeline to also build the Docker images in order to catch any regressions in the deployment process via Docker. ## Implementation Notes :hammer_and_pick: * Build Docker images for build pipeline * Reduce build steps for Docker image * Ensure Node.js is downloaded ## Breaking API Changes :warning: N/A
-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)