UNCLASSIFIED

Commit 45e15aff authored by Al Fontaine's avatar Al Fontaine
Browse files

Merge branch 'development' into 'master'

Development

See merge request !31
parents e4986883 2b970d41
Pipeline #204031 failed with stages
in 55 minutes and 21 seconds
ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
ARG BASE_TAG=1.11
FROM sonarqube:8.6-community AS build
FROM sonarqube:8.7.1-community AS build
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
ARG SONARQUBE_VERSION="8.6-community"
ARG SONARQUBE_VERSION="8.7-community"
ENV SONAR_VERSION="${SONARQUBE_VERSION}" \
SONARQUBE_HOME="/opt/sonarqube" \
SQ_DATA_DIR="/opt/sonarqube/data" \
......
......@@ -9,5 +9,5 @@ dependencies:
git:
repo: https://github.com/SonarSource/docker-sonarqube
directory: /8/community
ref: 8.6
ref: 8.7.1
updateStrategy: resource-merge
......@@ -8,7 +8,7 @@ name: "sonarsource/sonarqube/sonarqube8-community"
# The most specific version should be the first tag and will be shown
# on ironbank.dsop.io
tags:
- "8.6-community"
- "8.7.1-community"
- "latest"
# Build args passed to Dockerfile ARGs
......@@ -27,7 +27,7 @@ labels:
org.opencontainers.image.url: "https://docs.sonarqube.org/latest/"
## Name of the distributing entity, organization or individual
org.opencontainers.image.vendor: "SonarSource SA"
org.opencontainers.image.version: "8.6-community"
org.opencontainers.image.version: "8.7.1-community"
## Keywords to help with search (ex. "cicd,gitops,golang")
mil.dso.ironbank.image.keywords: "cicd,devops,sast,review"
## This value can be "opensource" or "commercial"
......@@ -37,8 +37,8 @@ labels:
# List of resources to make available to the offline build context
resources:
- url: docker://docker.io/library/sonarqube@sha256:993b79a45e985a36046327759ecc76d711dfde123ed11944d32a3282d66758cb
tag: sonarqube:8.6-community
- url: docker://docker.io/library/sonarqube@sha256:0ecf7b8b94efa1d010054f8b930e671c4415b6673e8e3bafa6d0a8c6b62d546f
tag: sonarqube:8.7.1-community
# List of project 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