Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
DATABASE_USER: ${{env.test_database_user}}
DATABASE_PASSWORD: ${{ env.test_database_password }}
run: |
./gradlew build jacocoTestReport sonar -Prelease "-Dorg.gradle.jvmargs=-Xms512m -Xmx4g -XX:MaxMetaspaceSize=1g" -Dtesting.database.mssql.image=${{ env.accountid }}.dkr.ecr.us-east-1.amazonaws.com/cdc-nbs-modernization/deduplication-test-db:latest
./gradlew build jacocoTestReport sonar "-Dorg.gradle.jvmargs=-Xms512m -Xmx4g -XX:MaxMetaspaceSize=1g" -Dtesting.database.mssql.image=${{ env.accountid }}.dkr.ecr.us-east-1.amazonaws.com/cdc-nbs-modernization/deduplication-test-db:latest

- name: Publish Testing Reports
uses: actions/upload-artifact@v4
Expand Down
4 changes: 1 addition & 3 deletions data-ingestion-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM amazoncorretto:21 as builder

RUN yum install -y git

# try patching system (libxml2) for security fixes
RUN yum update -y libxml2 && yum clean all

Expand All @@ -21,7 +19,7 @@ COPY . /usr/src/dataingestion
WORKDIR /usr/src/dataingestion

#Build report service along with any required libraries
RUN ./gradlew :data-ingestion-service:buildNeeded -Prelease -x test --no-daemon
RUN ./gradlew :data-ingestion-service:buildNeeded -x test --no-daemon

FROM amazoncorretto:21

Expand Down
19 changes: 1 addition & 18 deletions data-ingestion-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,7 @@ plugins {
apply plugin: 'org.owasp.dependencycheck'

group = 'gov.cdc.dataingestion'

def getVersionName = {
def stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'describe', '--tags', '--abbrev=0'
standardOutput = stdout
}
def tag = stdout.toString().trim()
if (tag.startsWith('v')) {
tag = tag.substring(1)
}
return tag + "-SNAPSHOT"
}

version = project.hasProperty('release') ? getVersionName() : '0.0.1-SNAPSHOT'

println("Data Ingestion jar version: " + version);

version = '0.0.1-SNAPSHOT'

springBoot {
buildInfo()
Expand Down
Loading