Merge pull request #24 from devonfw/bugfix-1.1

Bugfix 1.1

ISSUE_TEMPLATE.asciidoc

@@ -1,13 +1,12 @@
-Category: Bug or enhancement
+**Category: Bug or enhancement**
+**Severity: LOW , MEDIUM, HIGH, CRITICAL**
 
-Severity: Low , Medium, High, Critical
+**Expected behaviour (In case of bug)**
 
-Expected behaviour (In case of bug)
+**Actual/current behaviour (In case of bug)**
 
-Actual/current behaviour (In case of bug)
+**Steps to reproduce (In case of bug)**
 
-Steps to reproduce (In case of bug)
+**Description of issue / expected enhacement /Comments**
 
-Description of issue / expected enhacement /Comments
-
-Your environment - windows/Linux, docker, openshift, kubernetes
+**Your environment: WINDOWS/LINUX, DOCKER, OPENSHIFT, KUBERNETES**

PULL_REQUEST_TEMPLATE.asciidoc

@@ -1,5 +1,5 @@
-Issue Number
+**Issue Number:**
 
-Implementation description
+**Implementation description**
 
 @devonfw/devonfw-shop-floor

README.md

@@ -63,9 +63,10 @@ More specific info in the Wiki.
 - [How to deploy](https://github.com/devonfw/devonfw-shop-floor/tree/master/dsf4docker/devonfw-deployment) **Devonfw** projects using **docker-compose**
 
 ### OpenShift:
-- Scripts for the installation of an **OpenShift Origin v3.6** installation (once **docker** and **openshift client (oc)** are installed).
+- Scripts for the configuration of an **OpenShift Origin v3.9** installation (once **docker** and **openshift client (oc)** are installed).
 - **Devonfw templates** for **Angular** and **Java** projects, for deployment in the cluster.
 - Deployment script (alterative way of deployment, instead of using the OpenShift dashboard).
+- Delete script (alterative way of delete, instead of using the OpenShift dashboard).
 
 ### Backup:
 - Scripts to make backups of your databases in a remote machine (production-like machine).

dsf4openshift/README.md

@@ -4,12 +4,6 @@
 
 This are a complete documentation to install and configure an Openshift Cluster to be a DevonFW Openshift Cluster.
 
-- Inside the `command-line` folder, here are scripts to manage DevonFW Openshift.
-- Inside the `initial-setup` folder, here are all about how to configure an Openshift cluster to be a DevonFW Openshift Cluster.
-- Inside the `install` folder, here are all about how to install and run a persistent Openshift Cluster.
-- Inside the `s2i` folder, here are all about s2i _(source to image)_ templates and souce to build an s2i images. It provides OpenShift builder images for components of the devonfw (at this momento only for angular and java).
-- Inside the `templates` folder, here are all about DevonFW templates to build devonfw apps for Openshift using the s2i images.
-
 ## Devonfw Primed by Red Hat for OpenShift
 
 ![](../readme/devonfw-shop-floor-openshift-primed.jpg)

dsf4openshift/openshift-cluster-setup/README.md

@@ -0,0 +1,9 @@
+# Devonfw Shop Floor for OpenShift Cluster Setup
+
+## Content
+
+This are a complete documentation to install and configure an Openshift Cluster to be a DevonFW Openshift Cluster.
+
+- Inside the `command-line` folder, here are scripts to manage DevonFW Openshift.
+- Inside the `initial-setup` folder, here are all about how to configure an Openshift cluster to be a DevonFW Openshift Cluster.
+- Inside the `install` folder, here are all about how to install and run a persistent Openshift Cluster.

dsf4openshift/openshift-cluster-setup/command-line/deploy-app/example-paramfiles/README.md

@@ -3,5 +3,5 @@
 This are files to make things with the scripts for DevonFW Openshift Origin using My Thai Star Angular and Java Projects that are located in [Oasp](https://github.com/oasp/my-thai-star).
 
 More information:
-- [Deploy App](https://github.com/devonfw/devonfw-shop-floor/tree/master/dsf4openshift/cluster/command-line/deploy-app).
+- [Deploy App](./../).
 

dsf4openshift/openshift-cluster-setup/command-line/deploy-app/example-paramfiles/mythaistar-angular

@@ -1,19 +1,3 @@
-# /*******************************************************************************
-#  * Copyright 2015-2018 Capgemini SE.
-#  * 
-#  *  Licensed under the Apache License, Version 2.0 (the "License");
-#  *  you may not use this file except in compliance with the License.
-#  *  You may obtain a copy of the License at
-#  * 
-#  *      http://www.apache.org/licenses/LICENSE-2.0
-#  * 
-#  *  Unless required by applicable law or agreed to in writing, software
-#  *  distributed under the License is distributed on an "AS IS" BASIS,
-#  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  *  See the License for the specific language governing permissions and
-#  *  limitations under the License.
-#  ******************************************************************************/
-
 PROJECT="mythaistar"
 PROJECT_DISPLAYNAME="My Thai Star"
 DESCRIPTION="My Thai Star reference application for DevonFW"

dsf4openshift/openshift-cluster-setup/initial-setup/README.md

@@ -13,13 +13,23 @@ DevonFw Openshift Origin use custom icons, and we need to add it to openshift. M
 
 This script do as follows:
 1. Create a project devonfw
-2. Build inside devonfw a s2i-devonfw-java and s2i-devonfw-angular images from the template located in [s2i](./../s2i) section.
+2. Build inside devonfw a s2i-devonfw-java and s2i-devonfw-angular images from the template located in [s2i](./../../openshift-devonfw-deployment/s2i) section.
 3. Setup the devonfw project as "image-puller" to let their imagenes be used in other projects in the same cluster.
-4. Add to namespace openshift a devonfw-java and a devonfw-angular templates located in [templates](./../templates) section. This templates are added in the openshift namespace to be used by everyone for build a devonfw application.
+4. Add to namespace openshift a devonfw-java and a devonfw-angular templates located in [templates](./../../openshift-devonfw-deployment/templates) section. This templates are added in the openshift namespace to be used by everyone for build a devonfw application.
 
 ## Known issues
 
-##### Failed to push image
+### When I run the script, I receive the following error message:
+```diff
+- deploy-app.sh: line 2: $'\r': command not found
+- deploy-app.sh: line 4: syntax error near unexpected token `$'\r''
+```
+It is because the script has been edited in windows, and the end line in windows is \r\n but in linux \r don't exist. To solve it execute the next command:
+```
+sed -i 's/\r$//' filename
+```
+
+### Failed to push image
 
 If you recive an error like this:
 ```

dsf4openshift/openshift-cluster-setup/initial-setup/create-system-admin.sh

@@ -1,21 +1,21 @@
-# /*******************************************************************************
-#  * Copyright 2015-2018 Capgemini SE.
-#  * 
-#  *  Licensed under the Apache License, Version 2.0 (the "License");
-#  *  you may not use this file except in compliance with the License.
-#  *  You may obtain a copy of the License at
-#  * 
-#  *      http://www.apache.org/licenses/LICENSE-2.0
-#  * 
-#  *  Unless required by applicable law or agreed to in writing, software
-#  *  distributed under the License is distributed on an "AS IS" BASIS,
-#  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  *  See the License for the specific language governing permissions and
-#  *  limitations under the License.
-#  ******************************************************************************/
-
 #/bin/bash
 
+############################################################################
+# Copyright 2015-2018 Capgemini SE.
+# 
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+############################################################################
+
 RED="\033[31m"
 BLUE="\033[34m"
 NC="\033[0m"

dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/README.md

@@ -29,13 +29,13 @@ Example:
 
 ```
 webconsole-config.yaml: |
-	[...]
-    extensions:
-      scriptURLs:
-        - https://cdn.rawgit.com/devonfw/devonfw-shop-floor/master/dsf4openshift/initial-setup/customizeOpenshift/scripts/catalog-categories.js
-      stylesheetURLs:
-		- https://cdn.rawgit.com/devonfw/devonfw-shop-floor/master/dsf4openshift/initial-setup/customizeOpenshift/stylesheet/icons.css
-    [...]
+  [...]
+  extensions:
+    scriptURLs:
+      - https://cdn.rawgit.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/scripts/catalog-categories.js
+    stylesheetURLs:
+      - https://cdn.rawgit.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/stylesheet/icons.css
+  [...]
 ```
 
 ## More information

dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/modifications of the webconsole-config file.yaml

@@ -0,0 +1,24 @@
+############################################################################
+# Copyright 2015-2018 Capgemini SE.
+# 
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+############################################################################
+
+webconsole-config.yaml:
+  [...]
+  extensions:
+    scriptURLs:
+      - https://cdn.rawgit.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/scripts/catalog-categories.js
+    stylesheetURLs:
+      - https://cdn.rawgit.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/stylesheet/icons.css
+  [...]

dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/stylesheet/icons.css

@@ -15,33 +15,33 @@
  ******************************************************************************/
 
 #header-logo {
-  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/initial-setup/customizeOpenshift/images/devonfw-openshift.png");
+  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/images/devonfw-openshift.png");
   width: 230px;
   height: 40px;
 }
 
 .devonfw-logo-language {
-  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/initial-setup/customizeOpenshift/images/devonfw-languagesIcon.png");
+  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/images/devonfw-languagesIcon.png");
   width: 110px;
   height: 36px;
 }
 
 .devonfw-logo {
-  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/initial-setup/customizeOpenshift/images/devonfw.png");
+  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/images/devonfw.png");
   width: 50px;
   height: 50px;
 }
 
 .devonfw-angular-logo {
-  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/initial-setup/customizeOpenshift/images/devonfw-angular.png");
-  content: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/initial-setup/customizeOpenshift/images/devonfw-angular.png");
+  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/images/devonfw-angular.png");
+  content: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/images/devonfw-angular.png");
   width: 50px;
   height: 50px;
 }
 
 .devonfw-java-logo {
-  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/initial-setup/customizeOpenshift/images/devonfw-java.png");
-  content: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/initial-setup/customizeOpenshift/images/devonfw-java.png");
+  background-image: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/images/devonfw-java.png");
+  content: url("https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-cluster-setup/initial-setup/customizeOpenshift/images/devonfw-java.png");
   width: 50px;
   height: 50px;
 }

dsf4openshift/openshift-cluster-setup/initial-setup/initial-setup.sh

@@ -1,21 +1,21 @@
-# /*******************************************************************************
-#  * Copyright 2015-2018 Capgemini SE.
-#  * 
-#  *  Licensed under the Apache License, Version 2.0 (the "License");
-#  *  you may not use this file except in compliance with the License.
-#  *  You may obtain a copy of the License at
-#  * 
-#  *      http://www.apache.org/licenses/LICENSE-2.0
-#  * 
-#  *  Unless required by applicable law or agreed to in writing, software
-#  *  distributed under the License is distributed on an "AS IS" BASIS,
-#  *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  *  See the License for the specific language governing permissions and
-#  *  limitations under the License.
-#  ******************************************************************************/
-
 #/bin/bash
 
+############################################################################
+# Copyright 2015-2018 Capgemini SE.
+# 
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+############################################################################
+
 RED="\033[31m"
 BLUE="\033[34m"
 NC="\033[0m"
@@ -55,8 +55,8 @@ oc new-project devonfw --display-name='DevonFW' --description='DevonFW'
 
 ## Create base-images and add them to DevonFW project
 ### this files are private, to share it, you must enter in Git with a valid user, open the file and press RAW Button to generate a valid token
-oc create -f https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/s2i/java/s2i-devonfw-java-imagestream.json --namespace=devonfw
-oc create -f https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/s2i/angular/s2i-devonfw-angular-imagestream.json --namespace=devonfw
+oc create -f https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-devonfw-deployment/s2i/java/s2i-devonfw-java-imagestream.json --namespace=devonfw
+oc create -f https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-devonfw-deployment/s2i/angular/s2i-devonfw-angular-imagestream.json --namespace=devonfw
 
 ## Build base-images in DevonFW project
 oc start-build s2i-devonfw-java --namespace=devonfw
@@ -75,8 +75,8 @@ oc policy add-role-to-group system:image-puller system:authenticated --namespace
 
 # STEP 4: Create DevonFW templates into openshift
 ### if this files are private, to share it, you must enter in Git with a valid user, open the file and press RAW Button to generate a valid token
-oc create -f https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/templates/devonfw-java-template.json --namespace=openshift
-oc create -f https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/templates/devonfw-angular-template.json --namespace=openshift
+oc create -f https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-devonfw-deployment/templates/devonfw-java-template.json --namespace=openshift
+oc create -f https://raw.githubusercontent.com/devonfw/devonfw-shop-floor/master/dsf4openshift/openshift-devonfw-deployment/templates/devonfw-angular-template.json --namespace=openshift
 
 echo -e "\nCluster Initial Setup finish.\n"
 read -n1 -r -p "Press any key to close..." key