UNCLASSIFIED
Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Ironbank Containers
J
JFrog
artifactory
artifactory
Commits
d4c5bea2
Commit
d4c5bea2
authored
Nov 18, 2020
by
alexander.klepal
Browse files
Merge branch '7.10.6' into 'development'
Artifactory 7.10.6, Helm chart 11.4.5 See merge request
!17
parents
484ad2b4
0a2f1854
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
Dockerfile
Dockerfile
+3
-3
Jenkinsfile
Jenkinsfile
+1
-1
download.yaml
download.yaml
+2
-2
No files found.
Dockerfile
View file @
d4c5bea2
...
@@ -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 \
...
...
Jenkinsfile
View file @
d4c5bea2
@Library
(
'DCCSCR@master'
)
_
@Library
(
'DCCSCR@master'
)
_
dccscrPipeline
(
version:
"7.10.
2
"
)
dccscrPipeline
(
version:
"7.10.
6
"
)
download.yaml
View file @
d4c5bea2
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment