update annotation build profile && update Dockerfile.Sonar with frontend
This commit is contained in:
parent
e038a6fdf0
commit
1bcdd24f13
|
|
@ -5,6 +5,9 @@ ARG MAVEN_ACCOUNT_USR
|
|||
ARG MAVEN_ACCOUNT_PSW
|
||||
ARG REVISION
|
||||
ARG PROFILE
|
||||
ARG ORACLE_URL
|
||||
ARG ORACLE_TOKEN
|
||||
ARG BUILD
|
||||
ENV server_username=$MAVEN_ACCOUNT_USR
|
||||
ENV server_password=$MAVEN_ACCOUNT_PSW
|
||||
ARG CITE_MAVEN_REPO_URL
|
||||
|
|
@ -38,19 +41,52 @@ COPY oracle.local.cite.gr.crt $JAVA_HOME/conf/security
|
|||
RUN cd "$JAVA_HOME"/conf/security && keytool -cacerts -storepass changeit -noprompt -trustcacerts -importcert -alias oraclecert -file oracle.local.cite.gr.crt
|
||||
|
||||
WORKDIR /build/
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} clean
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} install
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} package
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} clean
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} install
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} package
|
||||
RUN mvn sonar:sonar -Dsonar.projectKey=OpenDMP:backend-api -Dsonar.login=${ORACLE_TOKEN} -Dsonar.host.url=${ORACLE_URL} -Dsonar.projectName='OpenDMP API'
|
||||
|
||||
WORKDIR /build-notification/
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} clean
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} install
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} package
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} clean
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} install
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} package
|
||||
RUN mvn sonar:sonar -Dsonar.projectKey=OpenDMP:notification-api -Dsonar.login=${ORACLE_TOKEN} -Dsonar.host.url=${ORACLE_URL} -Dsonar.projectName='OpenDMP Notification API'
|
||||
|
||||
WORKDIR /build-annotation/
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} clean
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} install
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} package
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} clean
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} install
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} package
|
||||
RUN mvn sonar:sonar -Dsonar.projectKey=OpenDMP:annotation-api -Dsonar.login=${ORACLE_TOKEN} -Dsonar.host.url=${ORACLE_URL} -Dsonar.projectName='OpenDMP Annotation API'
|
||||
|
||||
################################## frontend analysis ##########################################
|
||||
FROM node:20
|
||||
|
||||
ARG ORACLE_URL
|
||||
ARG ORACLE_TOKEN
|
||||
ARG BUILD_VERSION
|
||||
ENV ORACLE_URL=$ORACLE_URL
|
||||
ENV ORACLE_TOKEN=$ORACLE_TOKEN
|
||||
ENV BUILD_VERSION=$BUILD_VERSION
|
||||
|
||||
RUN apt-get -y update && apt-get install -y openjdk-11-jdk locales && apt-get clean
|
||||
RUN mkdir -p /usr/share/man/man1/
|
||||
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
|
||||
locale-gen
|
||||
ENV LC_ALL en_US.UTF-8
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LANGUAGE en_US:en
|
||||
|
||||
COPY oracle.local.cite.gr.crt /usr/local/share/ca-certificates/oracle.local.cite.gr.crt
|
||||
RUN update-ca-certificates
|
||||
|
||||
# copy the package.json to install dependencies
|
||||
COPY /dmp-frontend/package.json ./
|
||||
COPY /dmp-frontend/package-lock.json ./
|
||||
|
||||
# Install the dependencies and make the folder
|
||||
RUN npm install sonar-scanner --save-dev
|
||||
RUN npm install --legacy-peer-deps && mkdir /src && mv ./node_modules ./src
|
||||
|
||||
WORKDIR /src
|
||||
COPY . .
|
||||
RUN npm run sonar-scanner
|
||||
|
|
@ -5,9 +5,9 @@ ARG MAVEN_ACCOUNT_USR
|
|||
ARG MAVEN_ACCOUNT_PSW
|
||||
ARG REVISION
|
||||
ARG PROFILE
|
||||
ARG DEV_PROFILE_URL
|
||||
ENV server_username=$MAVEN_ACCOUNT_USR
|
||||
ENV server_password=$MAVEN_ACCOUNT_PSW
|
||||
ARG CITE_MAVEN_REPO_URL
|
||||
|
||||
COPY pom.xml /build/
|
||||
COPY annotation /build/annotation/
|
||||
|
|
@ -20,10 +20,10 @@ RUN rm -f /build/annotation-web/src/main/resources/certificates/*.crt
|
|||
|
||||
WORKDIR /build/
|
||||
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} clean
|
||||
RUN mvn -Dserver.username=${CITE_MAVEN_ACCOUNT_USR} -Dserver.password=${CITE_MAVEN_ACCOUNT_PSW} install
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} clean
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} install
|
||||
# Build project
|
||||
RUN mvn -Drevision=${REVISION} -DdevProfileUrl=${DEV_PROFILE_URL} -P${PROFILE} package
|
||||
RUN mvn -Drevision=${REVISION} -DciteMavenRepoUrl=${CITE_MAVEN_REPO_URL} -P${PROFILE} package
|
||||
|
||||
######################################## Run Stage ########################################
|
||||
FROM eclipse-temurin:21-jre-ubi9-minimal
|
||||
|
|
|
|||
|
|
@ -4,22 +4,28 @@
|
|||
</pluginGroups>
|
||||
<servers>
|
||||
<server>
|
||||
<id>dev</id>
|
||||
<id>cite-repo</id>
|
||||
<username>${server_username}</username>
|
||||
<password>${server_password}</password>
|
||||
</server>
|
||||
</servers>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>dev</id>
|
||||
<id>release</id>
|
||||
<repositories>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<repository>
|
||||
<id>dev</id>
|
||||
<name>Dev Profile</name>
|
||||
<url>${devProfileUrl}</url>
|
||||
<id>central</id>
|
||||
<name>Central Repository</name>
|
||||
<url>https://repo.maven.apache.org/maven2</url>
|
||||
<layout>default</layout>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>cite-repo</id>
|
||||
<name>CITE Maven Repo</name>
|
||||
<url>${citeMavenRepoUrl}</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
</profile>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
sonar.host.url=${ORACLE_URL}
|
||||
sonar.login=${ORACLE_TOKEN}
|
||||
sonar.projectKey=OpenDMP:frontend-api
|
||||
sonar.projectVersion=${BUILD_VERSION}
|
||||
sonar.sources=src
|
||||
sonar.exclusions=**/node_modules/**
|
||||
#sonar.tests=src
|
||||
#sonar.test.inclusions=**/*.spec.ts
|
||||
Loading…
Reference in New Issue