Merge branch 'release/v3.34.1-1'

Author: Joshua Sprey

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v3.34.1-1] - 2021-09-28
+### Changed
+- Upgrade to Nexus 3.34.1; #83
+- Upgrade to java 8u282
+
 ## [v3.32.0-2] - 2021-09-08
 ### Fixed
 - Login workflow with CAS 6 in combination with OIDC.

Dockerfile

@@ -1,11 +1,11 @@
 # registry.cloudogu.com/official/nexus
-FROM registry.cloudogu.com/official/java:8u252-1
-LABEL maintainer="robert.auer@cloudogu.com" \
+FROM registry.cloudogu.com/official/java:8u282-1
+LABEL maintainer="hello@cloudogu.com" \
     NAME="official/nexus" \
-    VERSION="3.32.0-2"
+    VERSION="3.34.1-1"
 
 # The version of nexus to install
-ENV NEXUS_VERSION=3.32.0-03 \
+ENV NEXUS_VERSION=3.34.1-01 \
     TINI_VERSION=0.19.0 \
     NEXUS_CLAIM_VERSION=1.0.0 \
     NEXUS_CARP_VERSION=1.3.0 \
@@ -16,7 +16,7 @@ ENV NEXUS_VERSION=3.32.0-03 \
     NEXUS_WORKDIR=/opt/sonatype/nexus \
     NEXUS_SERVER="http://localhost:8081/nexus" \
     SHA256_TINI="c5b0666b4cb676901f90dfcb37106783c5fe2077b04590973b885950611b30ee" \
-    SHA256_NEXUS_TAR="f5b8021d26b4faa9b56fc79fc342656640dbdb60f80ac2c65d8fb418f65d8f9d" \
+    SHA256_NEXUS_TAR="58d69f6fc28a9ed1616ad99c3ef390c7484e88cf729efc450c6e21273e8571e3" \
     SHA256_NEXUS_CLAIM="a34608ac7b516d6bc91f8a157bea286919c14e5fb5ecc76fc15edccb35adec42" \
     SHA256_NEXUS_SCRIPTING="60c7f3d8a0c97b1d90d954ebad9dc07dbeb7927934b618c874b2e72295cafb48" \
     SHA256_NEXUS_CARP="67948805a0395e658d07aa7759653c6309d20f5f128015b9c0d2782b43cf7824"

Jenkinsfile

@@ -1,5 +1,5 @@
 #!groovy
-@Library(['github.com/cloudogu/ces-build-lib@1.44.2', 'github.com/cloudogu/dogu-build-lib@v1.3.0', 'github.com/cloudogu/[email protected].1'])
+@Library(['github.com/cloudogu/ces-build-lib@v1.48.0', 'github.com/cloudogu/dogu-build-lib@v1.4.1'])
 import com.cloudogu.ces.cesbuildlib.*
 import com.cloudogu.ces.dogubuildlib.*
 import com.cloudogu.ces.zaleniumbuildlib.*

README.md

@@ -25,34 +25,10 @@ cesapp install official/nexus
 cesapp start nexus
 ```
 
-## Claim
+## Where do I find more information about the Nexus dogu?
 
-The preconfigured nexus repositories can be changed by using [nexus-claim](https://github.com/cloudogu/nexus-claim).
-First we have to create a model for our changes, e.g.: [sample](https://raw.githubusercontent.com/cloudogu/nexus-claim/develop/resources/nexus3/nexus3-initial-example.hcl). 
-We could test our model by using the plan command against a running instance of nexus (note: do not forget to set credentials):
-
-```bash
-nexus-claim plan -i nexus3-initial-example.hcl
-```
-
-If the output looks good, we could store our model in the registry. 
-If we want to apply our model only once:
-
-```bash
-cat mymodel.hcl | etcdctl set /config/nexus/claim/once
-```
-
-Or we could apply our model on every start of nexus:
-
-```bash
-cat mymodel.hcl | etcdctl set /config/nexus/claim/always
-```
-
-## Nexus-Scripting
-[Nexus-Scripting](https://github.com/cloudogu/nexus-scripting) provides an go api and a command line interface for the scripting api Sonatype Nexus 3.
-
-## Nexus-Carp
-[Nexus-Carp](https://github.com/cloudogu/nexus-carp) is the CAS Authentication Reverse Proxy for Sonatype Nexus.
+- [Deutsch] [Dokumentation](docs/getting_started_de.md)
+- [English] [Documentation](docs/getting_started_en.md)
 
 ---
 ### What is the Cloudogu EcoSystem?

docs/getting_started_de.md

@@ -0,0 +1,16 @@
+---
+title: "Getting Started"
+---
+
+# Nexus-Dokumentation
+
+## Nexus-Scripting
+[Nexus-Scripting](https://github.com/cloudogu/nexus-scripting) bietet eine Go-Api und eine Kommandozeilen-Schnittstelle für die Scripting-Api Sonatype Nexus 3.
+
+## Nexus-Carp
+[Nexus-Carp](https://github.com/cloudogu/nexus-carp) ist der CAS Authentication Reverse Proxy für Sonatype Nexus.
+
+## Guides
+
+- [Nexus-claim zur Vorkonfiguration von Repositories verwenden](operations/preconfigure_repositories_de.md)
+

docs/getting_started_en.md

@@ -0,0 +1,16 @@
+---
+title: "Getting Started"
+---
+
+# Nexus documentation
+
+## Nexus-Scripting
+[Nexus-Scripting](https://github.com/cloudogu/nexus-scripting) provides a go api and a command line interface for the scripting api Sonatype Nexus 3.
+
+## Nexus-Carp
+[Nexus-Carp](https://github.com/cloudogu/nexus-carp) is the CAS Authentication Reverse Proxy for Sonatype Nexus.
+
+## Guides
+
+- [Use nexus-claim to preconfigure repositories](operations/preconfigure_repositories_en.md)
+

docs/operations/preconfigure_repositories_de.md

@@ -0,0 +1,22 @@
+## Verwenden Sie nexus-claim, um die Repositories vorzukonfigurieren
+
+Die vorkonfigurierten Nexus-Repositories können mit [nexus-claim](https://github.com/cloudogu/nexus-claim) geändert werden.
+Zuerst müssen wir ein Model für unsere Änderungen erstellen, z.B.: [sample](https://raw.githubusercontent.com/cloudogu/nexus-claim/develop/resources/nexus3/nexus3-initial-example.hcl). 
+Wir können unser Model testen, indem wir den Befehl plan gegen eine laufende Instanz von Nexus verwenden (Hinweis: Vergessen Sie nicht, die Anmeldedaten zu setzen):
+
+```bash
+nexus-claim plan -i nexus3-initial-example.hcl
+```
+
+Wenn die Ausgabe gut aussieht, können wir unser Model in der Registry speichern. 
+Wenn wir unser Model nur einmal anwenden wollen:
+
+```bash
+cat mymodel.hcl | etcdctl set /config/nexus/claim/once
+```
+
+Oder wir könnten unser Model bei jedem Start von Nexus anwenden:
+
+```bash
+cat mymodel.hcl | etcdctl set /config/nexus/claim/always
+```

docs/operations/preconfigure_repositories_en.md

@@ -0,0 +1,22 @@
+## Use nexus-claim to preconfigure repositories
+
+The preconfigured Nexus repositories can be changed by using [nexus-claim](https://github.com/cloudogu/nexus-claim).
+First we have to create a model for our changes, e.g.: [sample](https://raw.githubusercontent.com/cloudogu/nexus-claim/develop/resources/nexus3/nexus3-initial-example.hcl). 
+We could test our model by using the plan command against a running instance of Nexus (note: do not forget to set credentials):
+
+```bash
+nexus-claim plan -i nexus3-initial-example.hcl
+```
+
+If the output looks good, we could store our model in the registry. 
+If we want to apply our model only once:
+
+```bash
+cat mymodel.hcl | etcdctl set /config/nexus/claim/once
+```
+
+Or we could apply our model on every start of nexus:
+
+```bash
+cat mymodel.hcl | etcdctl set /config/nexus/claim/always
+```

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/nexus",
-  "Version": "3.32.0-2",
+  "Version": "3.34.1-1",
   "DisplayName": "Sonatype Nexus",
   "Description": "The Nexus Repository is like the local warehouse where all of the parts and finished goods used in your software supply chain are stored and distributed.",
   "Url": "http://www.sonatype.org/nexus",

integrationTests/cypress/support/step_definitions/dogu_integration_test_library_steps.js

@@ -5,17 +5,17 @@ doguTestLibrary.registerSteps()
 When(/^the user clicks the dogu logout button$/, function () {
     Cypress.on('uncaught:exception', () => { return false; }); // Catch nexus errors and prevent test from failing
     cy.fullyLoadPageAndClosePopups()
-    cy.get('#nx-header-signout-1144-btnEl').click();
+    cy.get('#nx-header-signout-1146-btnInnerEl').click();
 });
 
 Then(/^the user has administrator privileges in the dogu$/, function () {
     Cypress.on('uncaught:exception', () => { return false; }); // Catch nexus errors and prevent test from failing
     cy.fullyLoadPageAndClosePopups()
-    cy.get('#button-1125-btnIconEl').should('be.visible')
+    cy.get('#button-1127-btnIconEl').should('be.visible')
 });
 
 Then(/^the user has no administrator privileges in the dogu$/, function () {
     Cypress.on('uncaught:exception', () => { return false; }); // Catch nexus errors and prevent test from failing
     cy.fullyLoadPageAndClosePopups()
-    cy.get('#button-1125-btnIconEl').should('not.be.visible')
+    cy.get('#button-1127-btnIconEl').should('not.be.visible')
 });