Skip to content

common-variable base_image changes / sonarqube fix #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

common-variable base_image changes / sonarqube fix #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05fc801
added common-variable base_image
May 11, 2021
3c92d47
bump version
May 11, 2021
bb7953b
bump version
May 11, 2021
3d1239c
fixed sonarqube scans, edited common-variables base_image
May 12, 2021
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
7 changes: 3 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,7 @@ podTemplate(
withSonarQubeEnv('sonarqube'){
sh """
${scannerHome}/bin/sonar-scanner \
-Dsonar.projectKey=omar-oms \
-Dsonar.login=${SONARQUBE_TOKEN}
-Dsonar.projectKey=omar-oms
"""
}
}
Expand Down Expand Up @@ -184,12 +183,12 @@ podTemplate(
withDockerRegistry(credentialsId: 'dockerCredentials', url: "https://${DOCKER_REGISTRY_DOWNLOAD_URL}") { //TODO
if (BRANCH_NAME == 'master'){
sh """
docker build --build-arg BASE_IMAGE=${DOCKER_REGISTRY_DOWNLOAD_URL}/ossim-alpine-runtime:dev --network=host -t "${DOCKER_REGISTRY_PUBLIC_UPLOAD_URL}"/omar-oms:"${VERSION}" ./docker
docker build --build-arg BASE_IMAGE=${JDK11_RUNTIME_BASE_IMAGE} --network=host -t "${DOCKER_REGISTRY_PUBLIC_UPLOAD_URL}"/omar-oms:"${VERSION}" ./docker
"""
}
else {
sh """
docker build --build-arg BASE_IMAGE=${DOCKER_REGISTRY_DOWNLOAD_URL}/ossim-alpine-runtime:1.4 --network=host -t "${DOCKER_REGISTRY_PUBLIC_UPLOAD_URL}"/omar-oms:"${VERSION}".a ./docker
docker build --build-arg BASE_IMAGE=${JDK11_RUNTIME_BASE_IMAGE} --network=host -t "${DOCKER_REGISTRY_PUBLIC_UPLOAD_URL}"/omar-oms:"${VERSION}".a ./docker
"""
}
}
Expand Down
4 changes: 2 additions & 2 deletions chart/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 2.1.0
version: 2.1.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 2.12.0
appVersion: 2.12.1
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
buildVersion=2.12.0
buildVersion=2.12.1

grailsVersion=4.0.1
gorm.version=7.0.2.RELEASE
Expand Down