diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-05-15 21:48:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-15 21:48:32 +0200 |
| commit | e35d7c49856d8fb5965a315976ac6fdd6c9fb718 (patch) | |
| tree | 1d34c185a02b29f3faa871607cc24eecbf5d2f15 /opendc-web | |
| parent | 8a772cf16457fb703ad468c3f06b02ca045e5ec4 (diff) | |
| parent | 3908391fd67da33df2d43c1b01a9e1709dd73c05 (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
Diffstat (limited to 'opendc-web')
| -rw-r--r-- | opendc-web/opendc-web-runner/Dockerfile | 4 | ||||
| -rw-r--r-- | opendc-web/opendc-web-ui/build.gradle.kts | 4 |
2 files changed, 6 insertions, 2 deletions
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) |