UNCLASSIFIED

Commit 0a2f1854 authored by Daniel Miakotkin's avatar Daniel Miakotkin
Browse files

Artifactory 7.10.6, Helm chart 11.4.5

parent 484ad2b4
...@@ -2,20 +2,20 @@ ARG BASE_REGISTRY=registry1.dsop.io ...@@ -2,20 +2,20 @@ ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_TAG=8.2 ARG BASE_TAG=8.2
FROM docker.bintray.io/jfrog/artifactory-pro:7.10.2 AS base FROM docker.bintray.io/jfrog/artifactory-pro:7.10.6 AS base
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
LABEL org.opencontainers.image.title="JFrog Artifactory Pro" \ LABEL org.opencontainers.image.title="JFrog Artifactory Pro" \
org.opencontainers.image.description="JFrog Artifactory Pro image based on the Red Hat Universal Base Image for DSOP." \ org.opencontainers.image.description="JFrog Artifactory Pro image based on the Red Hat Universal Base Image for DSOP." \
org.opencontainers.image.url="https://jfrog.com" \ org.opencontainers.image.url="https://jfrog.com" \
org.opencontainers.image.version="7.10.2" \ org.opencontainers.image.version="7.10.6" \
maintainer="cht@dsop.io" maintainer="cht@dsop.io"
USER root USER root
# Set vars # Set vars
ARG ARTIFACTORY_VERSION=7.10.2 ARG ARTIFACTORY_VERSION=7.10.6
ENV JF_ARTIFACTORY_USER=artifactory \ ENV JF_ARTIFACTORY_USER=artifactory \
ARTIFACTORY_VERSION=${ARTIFACTORY_VERSION} \ ARTIFACTORY_VERSION=${ARTIFACTORY_VERSION} \
ARTIFACTORY_BOOTSTRAP=/artifactory_bootstrap \ ARTIFACTORY_BOOTSTRAP=/artifactory_bootstrap \
......
@Library('DCCSCR@master') _ @Library('DCCSCR@master') _
dccscrPipeline(version: "7.10.2") dccscrPipeline(version: "7.10.6")
resources: resources:
- url: "docker://docker.bintray.io/jfrog/artifactory-pro@sha256:35420312a1688f06015353773ffa3767c179df1238fd83d49c84a05de66d6389" - url: "docker://docker.bintray.io/jfrog/artifactory-pro@sha256:6ff8ed78b0c1a66fd9d93bb6d000d4ee3feb2a21c9adda5bd116d36e0845221c"
tag: "docker.bintray.io/jfrog/artifactory-pro:7.10.2" tag: "docker.bintray.io/jfrog/artifactory-pro:7.10.6"
\ No newline at end of file \ No newline at end of file
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