Skip to content

Commit

Permalink
Merge branch 'sonatype:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
madpah authored May 16, 2024
2 parents 22b6493 + 5feb0ad commit d5be98b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions Dockerfile.java11
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal
LABEL name="Nexus Repository Manager" \
maintainer="Sonatype <support@sonatype.com>" \
vendor=Sonatype \
version="3.68.1-02" \
release="3.68.1" \
version="3.68.0-04" \
release="3.68.0" \
url="https://sonatype.com" \
summary="The Nexus Repository Manager server \
with universal support for popular component formats." \
Expand All @@ -36,10 +36,10 @@ LABEL name="Nexus Repository Manager" \
io.openshift.expose-services="8081:8081" \
io.openshift.tags="Sonatype,Nexus,Repository Manager"

ARG NEXUS_VERSION=3.68.1-02
ARG NEXUS_VERSION=3.68.0-04
ARG JAVA_VERSION=java11
ARG NEXUS_DOWNLOAD_URL=https://download.sonatype.com/nexus/3/nexus-${NEXUS_VERSION}-${JAVA_VERSION}-unix.tar.gz
ARG NEXUS_DOWNLOAD_SHA256_HASH=6a04eb770e0c4415d3033de757b07ddfdfd15beadbf839d4b33438246e4325a7
ARG NEXUS_DOWNLOAD_SHA256_HASH=aa03f3c5511579f42b6bdacdfe9f1e1634aea41ff31a9a8a02cc47ab53cc8739

# configure nexus runtime
ENV SONATYPE_DIR=/opt/sonatype
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.rh.ubi.java11
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal
LABEL name="Nexus Repository Manager" \
vendor=Sonatype \
maintainer="Sonatype <support@sonatype.com>" \
version="3.68.1-02" \
release="3.68.1" \
version="3.68.0-04" \
release="3.68.0" \
url="https://sonatype.com" \
summary="The Nexus Repository Manager server \
with universal support for popular component formats." \
Expand All @@ -36,10 +36,10 @@ LABEL name="Nexus Repository Manager" \
io.openshift.expose-services="8081:8081" \
io.openshift.tags="Sonatype,Nexus,Repository Manager"

ARG NEXUS_VERSION=3.68.1-02
ARG NEXUS_VERSION=3.68.0-04
ARG JAVA_VERSION=java11
ARG NEXUS_DOWNLOAD_URL=https://download.sonatype.com/nexus/3/nexus-${NEXUS_VERSION}-${JAVA_VERSION}-unix.tar.gz
ARG NEXUS_DOWNLOAD_SHA256_HASH=6a04eb770e0c4415d3033de757b07ddfdfd15beadbf839d4b33438246e4325a7
ARG NEXUS_DOWNLOAD_SHA256_HASH=aa03f3c5511579f42b6bdacdfe9f1e1634aea41ff31a9a8a02cc47ab53cc8739

# configure nexus runtime
ENV SONATYPE_DIR=/opt/sonatype
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile-Release
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ node('ubuntu-zion') {

def dockerPushCmdsMap = [
(OPENJDK8): "docker push --all-tags ${organization}/${dockerHubRepository}",
(OPENJDK11): "docker push ${organization}/${dockerHubRepository}-${JAVA_11}",
(OPENJDK17): "docker push ${organization}/${dockerHubRepository}-${JAVA_17}"
(OPENJDK11): "docker push ${organization}/${dockerHubRepository}:${version}-${JAVA_11}",
(OPENJDK17): "docker push ${organization}/${dockerHubRepository}:${version}-${JAVA_17}"
]
def dockerPushCmd = dockerPushCmdsMap.get(params.java_version)

Expand Down

0 comments on commit d5be98b

Please sign in to comment.