UNCLASSIFIED

You need to sign in or sign up before continuing.
Commit 294d15e5 authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master'

Development

See merge request !37
parents fb227655 128883e5
Pipeline #333400 failed with stages
in 49 seconds
...@@ -2,11 +2,11 @@ ARG BASE_REGISTRY=registry1.dso.mil ...@@ -2,11 +2,11 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11 ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
ARG BASE_TAG=1.11 ARG BASE_TAG=1.11
FROM sonarqube:8.8-enterprise AS build FROM sonarqube:8.9-enterprise AS build
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
ARG SONARQUBE_VERSION="8.8-enterprise" ARG SONARQUBE_VERSION="8.9-enterprise"
ENV SONAR_VERSION="${SONARQUBE_VERSION}" \ ENV SONAR_VERSION="${SONARQUBE_VERSION}" \
SONARQUBE_HOME="/opt/sonarqube" \ SONARQUBE_HOME="/opt/sonarqube" \
SQ_DATA_DIR="/opt/sonarqube/data" \ SQ_DATA_DIR="/opt/sonarqube/data" \
......
...@@ -9,5 +9,5 @@ dependencies: ...@@ -9,5 +9,5 @@ dependencies:
git: git:
repo: https://github.com/SonarSource/docker-sonarqube repo: https://github.com/SonarSource/docker-sonarqube
directory: /8/enterprise directory: /8/enterprise
ref: 8.7.1 ref: 8.9
updateStrategy: resource-merge updateStrategy: resource-merge
...@@ -8,7 +8,7 @@ name: "sonarsource/sonarqube/sonarqube8-enterprise" ...@@ -8,7 +8,7 @@ name: "sonarsource/sonarqube/sonarqube8-enterprise"
# The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "8.8-enterprise" - "8.9-enterprise"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
...@@ -27,7 +27,7 @@ labels: ...@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://docs.sonarqube.org/latest/" org.opencontainers.image.url: "https://docs.sonarqube.org/latest/"
## Name of the distributing entity, organization or individual ## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "SonarSource SA" org.opencontainers.image.vendor: "SonarSource SA"
org.opencontainers.image.version: "8.8-enterprise" org.opencontainers.image.version: "8.9-enterprise"
## Keywords to help with search (ex. "cicd,gitops,golang") ## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "cicd,devops,sast,review" mil.dso.ironbank.image.keywords: "cicd,devops,sast,review"
## This value can be "opensource" or "commercial" ## This value can be "opensource" or "commercial"
...@@ -37,8 +37,8 @@ labels: ...@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context # List of resources to make available to the offline build context
resources: resources:
- url: "docker://docker.io/library/sonarqube@sha256:1d833019676c6bd32b9b10646065121189d2ef06f7e3be1561c480a4d4ab71b1" - url: "docker://docker.io/library/sonarqube@sha256:55d397a400d11411a7225a9ecedaeaf6f45096f1252b01feadbb0e9682f5a9fa"
tag: "sonarqube:8.8-enterprise" tag: "sonarqube:8.9-enterprise"
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment