28
28
with :
29
29
node-version-file : ' .nvmrc'
30
30
cache : ' npm'
31
+ cache-dependency-path : suoritusrekisteri/package-lock.json
31
32
32
33
- name : Run NPM
33
34
run : |
49
50
id : restore-build
50
51
with :
51
52
path : |
52
- target
53
+ suoritusrekisteri/target
54
+ ovara-suoritusrekisteri/target
53
55
key : ${{ github.sha }}
54
56
55
57
deploy-container :
63
65
id : restore-build
64
66
with :
65
67
path : |
66
- target
68
+ suoritusrekisteri/target
69
+ ovara-suoritusrekisteri/target
67
70
key : ${{ github.sha }}
68
71
69
72
- name : Build Docker container
@@ -74,12 +77,19 @@ jobs:
74
77
run : |
75
78
git clone https://github.com/Opetushallitus/ci-tools.git
76
79
source ci-tools/common/setup-tools.sh
77
- export ARTIFACT_NAME="suoritusrekisteri"
78
- mv target/suoritusrekisteri*allinone.jar $DOCKER_BUILD_DIR/artifact/${ARTIFACT_NAME}.jar
79
- jar xf $DOCKER_BUILD_DIR/artifact/${ARTIFACT_NAME}.jar META-INF/native
80
+ mv suoritusrekisteri/target/suoritusrekisteri*allinone.jar $DOCKER_BUILD_DIR/artifact/suoritusrekisteri.jar
81
+ jar xf $DOCKER_BUILD_DIR/artifact/suoritusrekisteri.jar META-INF/native
80
82
mv META-INF/native $DOCKER_BUILD_DIR/native_libs
81
- cp -vr src/main/resources/* $DOCKER_BUILD_DIR/config/
83
+ cp -vr suoritusrekisteri/src/main/resources/* $DOCKER_BUILD_DIR/config/
84
+
85
+ ./ci-tools/common/clean-docker-build-dir.sh
86
+ mv ovara-suoritusrekisteri/target/ovara-suoritusrekisteri*allinone.jar $DOCKER_BUILD_DIR/artifact/ovara-suoritusrekisteri.jar
87
+ jar xf $DOCKER_BUILD_DIR/artifact/ovara-suoritusrekisteri.jar META-INF/native
88
+ mv META-INF/native $DOCKER_BUILD_DIR/native_libs
89
+ cp -vr ovara-suoritusrekisteri/src/main/resources/* $DOCKER_BUILD_DIR/config/
90
+
82
91
export BASE_IMAGE="baseimage-fatjar-openjdk11:master"
83
92
./ci-tools/common/pull-image.sh
84
- ./ci-tools/github-build/build-fatjar.sh $ARTIFACT_NAME
85
- ./ci-tools/github-build/upload-image.sh $ARTIFACT_NAME
93
+ ./ci-tools/github-build/build-fatjar.sh suoritusrekisteri
94
+ ./ci-tools/github-build/upload-image.sh suoritusrekisteri
95
+ ./ci-tools/github-build/upload-image.sh ovara-suoritusrekisteri
0 commit comments