OPHYK-208 copy settings.xml to container

Opetushallitus · Jan 9, 2025 · 4fc1085 · 4fc1085
1 parent a6156a0
commit 4fc1085
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/henkilo-ui/Dockerfile b/henkilo-ui/Dockerfile
@@ -7,6 +7,7 @@ RUN dnf install -y nodejs20 \
   && alternatives --install /usr/bin/npx npx /usr/bin/npx-20 90
 
 COPY . .
+COPY ../settings.xml .
 
 WORKDIR /app/src/main/static
 RUN npm ci

diff --git a/henkilo-ui/pom.xml b/henkilo-ui/pom.xml
@@ -24,10 +24,6 @@
 
         <maven.compiler.release>21</maven.compiler.release>
 
-        <buildNumber>default buildnumber</buildNumber>
-        <branch>default branch</branch>
-        <revision>default revision</revision>
-
         <sonar.organization>opetushallitus</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <sonar.sources>src/main/java,src/main/static/src</sonar.sources>

diff --git a/infra/src/cdk-app-util.ts b/infra/src/cdk-app-util.ts
@@ -313,7 +313,11 @@ function makeUbuntuTestProject(
         TZ: {
           type: codebuild.BuildEnvironmentVariableType.PLAINTEXT,
           value: "Europe/Helsinki",
-        }
+        },
+        MVN_SETTINGSXML: {
+          type: codebuild.BuildEnvironmentVariableType.PARAMETER_STORE,
+          value: "/mvn/settingsxml",
+        },
       },
       buildSpec: codebuild.BuildSpec.fromObject({
         version: "0.2",
@@ -333,6 +337,7 @@ function makeUbuntuTestProject(
               "sudo apt-get install -y netcat", // for nc command
               "sudo apt-get install -y libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb", // For Cypress/Chromium
               `git checkout ${tag}`,
+              "echo $MVN_SETTINGSXML > ./settings.xml",
             ]
           },
           build: {