diff --git a/Dockerfile b/Dockerfile index a79b078..c53a795 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,8 @@ FROM registry.access.redhat.com/ubi8/ubi LABEL name="Nexus Repository Manager" \ maintainer="Sonatype " \ vendor=Sonatype \ - version="3.37.3-02" \ - release="3.37.3" \ + version="3.38.0-01" \ + release="3.38.0" \ url="https://sonatype.com" \ summary="The Nexus Repository Manager server \ with universal support for popular component formats." \ @@ -36,9 +36,9 @@ LABEL name="Nexus Repository Manager" \ io.openshift.expose-services="8081:8081" \ io.openshift.tags="Sonatype,Nexus,Repository Manager" -ARG NEXUS_VERSION=3.37.3-02 +ARG NEXUS_VERSION=3.38.0-01 ARG NEXUS_DOWNLOAD_URL=https://download.sonatype.com/nexus/3/nexus-${NEXUS_VERSION}-unix.tar.gz -ARG NEXUS_DOWNLOAD_SHA256_HASH=c1db431908c5a76b44015c555d6ef4517abf0a86844faffee0f5d6c62359312d +ARG NEXUS_DOWNLOAD_SHA256_HASH=d7ee5e2d7233ac8cfd4e9cc1e97d88313d24d662509d446784be5a50f677cc6f # configure nexus runtime ENV SONATYPE_DIR=/opt/sonatype diff --git a/Dockerfile.rh.centos b/Dockerfile.rh.centos index 4374c4f..4d6f6b5 100644 --- a/Dockerfile.rh.centos +++ b/Dockerfile.rh.centos @@ -17,8 +17,8 @@ FROM centos:centos7 LABEL name="Nexus Repository Manager" \ maintainer="Sonatype " \ vendor=Sonatype \ - version="3.37.3-02" \ - release="3.37.3" \ + version="3.38.0-01" \ + release="3.38.0" \ url="https://sonatype.com" \ summary="The Nexus Repository Manager server \ with universal support for popular component formats." \ @@ -36,9 +36,9 @@ LABEL name="Nexus Repository Manager" \ io.openshift.expose-services="8081:8081" \ io.openshift.tags="Sonatype,Nexus,Repository Manager" -ARG NEXUS_VERSION=3.37.3-02 +ARG NEXUS_VERSION=3.38.0-01 ARG NEXUS_DOWNLOAD_URL=https://download.sonatype.com/nexus/3/nexus-${NEXUS_VERSION}-unix.tar.gz -ARG NEXUS_DOWNLOAD_SHA256_HASH=c1db431908c5a76b44015c555d6ef4517abf0a86844faffee0f5d6c62359312d +ARG NEXUS_DOWNLOAD_SHA256_HASH=d7ee5e2d7233ac8cfd4e9cc1e97d88313d24d662509d446784be5a50f677cc6f # configure nexus runtime ENV SONATYPE_DIR=/opt/sonatype @@ -61,6 +61,7 @@ RUN curl -L https://omnitruck.chef.io/install.sh | bash -s -- -v ${CHEF_VERSION} --node_name nexus_repository_red_hat_docker_build \ --recipe-url ${NEXUS_REPOSITORY_MANAGER_COOKBOOK_URL} \ --json-attributes /var/chef/solo.json \ + --chef-license=accept \ && rpm -qa *chef* | xargs rpm -e \ && rpm --rebuilddb \ && rm -rf /etc/chef \ diff --git a/Dockerfile.rh.el b/Dockerfile.rh.el index 4ac47ea..f08da16 100644 --- a/Dockerfile.rh.el +++ b/Dockerfile.rh.el @@ -17,8 +17,8 @@ FROM registry.access.redhat.com/rhel7/rhel LABEL name="Nexus Repository Manager" \ maintainer="Sonatype " \ vendor=Sonatype \ - version="3.37.3-02" \ - release="3.37.3" \ + version="3.38.0-01" \ + release="3.38.0" \ url="https://sonatype.com" \ summary="The Nexus Repository Manager server \ with universal support for popular component formats." \ @@ -36,9 +36,9 @@ LABEL name="Nexus Repository Manager" \ io.openshift.expose-services="8081:8081" \ io.openshift.tags="Sonatype,Nexus,Repository Manager" -ARG NEXUS_VERSION=3.37.3-02 +ARG NEXUS_VERSION=3.38.0-01 ARG NEXUS_DOWNLOAD_URL=https://download.sonatype.com/nexus/3/nexus-${NEXUS_VERSION}-unix.tar.gz -ARG NEXUS_DOWNLOAD_SHA256_HASH=c1db431908c5a76b44015c555d6ef4517abf0a86844faffee0f5d6c62359312d +ARG NEXUS_DOWNLOAD_SHA256_HASH=d7ee5e2d7233ac8cfd4e9cc1e97d88313d24d662509d446784be5a50f677cc6f # configure nexus runtime ENV SONATYPE_DIR=/opt/sonatype diff --git a/Dockerfile.rh.ubi b/Dockerfile.rh.ubi index 6c016f4..204ed0a 100644 --- a/Dockerfile.rh.ubi +++ b/Dockerfile.rh.ubi @@ -17,8 +17,8 @@ FROM registry.access.redhat.com/ubi8/ubi LABEL name="Nexus Repository Manager" \ vendor=Sonatype \ maintainer="Sonatype " \ - version="3.37.3-02" \ - release="3.37.3" \ + version="3.38.0-01" \ + release="3.38.0" \ url="https://sonatype.com" \ summary="The Nexus Repository Manager server \ with universal support for popular component formats." \ @@ -36,9 +36,9 @@ LABEL name="Nexus Repository Manager" \ io.openshift.expose-services="8081:8081" \ io.openshift.tags="Sonatype,Nexus,Repository Manager" -ARG NEXUS_VERSION=3.37.3-02 +ARG NEXUS_VERSION=3.38.0-01 ARG NEXUS_DOWNLOAD_URL=https://download.sonatype.com/nexus/3/nexus-${NEXUS_VERSION}-unix.tar.gz -ARG NEXUS_DOWNLOAD_SHA256_HASH=c1db431908c5a76b44015c555d6ef4517abf0a86844faffee0f5d6c62359312d +ARG NEXUS_DOWNLOAD_SHA256_HASH=d7ee5e2d7233ac8cfd4e9cc1e97d88313d24d662509d446784be5a50f677cc6f # configure nexus runtime ENV SONATYPE_DIR=/opt/sonatype diff --git a/Jenkinsfile b/Jenkinsfile index 60c57d3..eb7f977 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,12 +90,12 @@ node('ubuntu-zion') { gitHub.statusUpdate commitId, 'pending', 'test', 'Tests are running' def gemInstallDirectory = getGemInstallDirectory() - /* withEnv(["PATH+GEMS=${gemInstallDirectory}/bin"]) { + withEnv(["PATH+GEMS=${gemInstallDirectory}/bin"]) { OsTools.runSafe(this, "gem install --user-install rspec") OsTools.runSafe(this, "gem install --user-install serverspec") OsTools.runSafe(this, "gem install --user-install docker-api") OsTools.runSafe(this, "IMAGE_ID=${imageId} rspec --backtrace spec/Dockerfile_spec.rb") - } */ + } if (currentBuild.result == 'FAILURE') { gitHub.statusUpdate commitId, 'failure', 'test', 'Tests failed' diff --git a/spec/Dockerfile_spec.rb b/spec/Dockerfile_spec.rb index 1c6033a..f2cadc8 100644 --- a/spec/Dockerfile_spec.rb +++ b/spec/Dockerfile_spec.rb @@ -37,8 +37,22 @@ describe 'Dockerfile' do expect(user('nexus')).to exist end - it 'should have a nexus process running' do - expect(process('java')).to be_running - expect(process('java')).to have_attributes(:user => 'nexus') + describe 'Dockerfile#running' do + before(:all) do + @container = Docker::Container.create( + 'Image' => @image.id + ) + @container.start + end + + it 'should have a nexus process running' do + expect(process('java')).to be_running + expect(process('java')).to have_attributes(user: 'nexus') + end + + after(:all) do + @container.kill + @container.delete(force: true) + end end end