copy config file on assemble

startxfr · Mar 3, 2018 · 2ee8630 · 2ee8630
1 parent f801467
commit 2ee8630
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 38 deletions.
diff --git a/.s2i/assemble b/.s2i/assemble
@@ -10,6 +10,9 @@
 cd $APP_PATH
 if[[ -d /tmp/src ]]; then
     cp -R /tmp/src/* $APP_PATH/
+    if[[ -f /tmp/src/sxapi.json ]]; then
+        cp -f /tmp/src/sxapi.json $CONF_PATH/sxapi.json
+    fi;
 #    rm -rf /tmp/src
 fi;
 npm install -production

diff --git a/openshift-template-build.json b/openshift-template-build.json
@@ -23,9 +23,9 @@
             "kind": "ImageStream",
             "apiVersion": "v1",
             "metadata": {
-                "name": "sxapi",
+                "name": "${APP_NAME}",
                 "annotations": {
-                    "openshift.io/display-name": "Startx SXAPI framework (S2I)",
+                    "openshift.io/display-name": "Application ${APP_NAME}",
                     "openshift.io/generated-by": "STARTX"
                 },
                 "labels": {
@@ -39,6 +39,17 @@
                 "tags": [
                     {
                         "name": "latest",
+                        "annotations": {
+                            "openshift.io/display-name": "Application ${APP_NAME}",
+                            "description": "Base image for the application ${APP_NAME}",
+                            "iconClass": "icon-nodejs",
+                            "tags": "startx,alpine,nodejs,sxapi-latest,application,${APP_NAME}",
+                            "supports": "sxapi:latest,nodejs,http",
+                            "version": "latest"
+                        }
+                    },
+                    {
+                        "name": "sxapi",
                         "annotations": {
                             "openshift.io/display-name": "S2I Startx SXAPI framework (latest)",
                             "description": "Builder for Simple and eXtensible API framework based on alpine (latest)",
@@ -56,38 +67,6 @@
                 ]
             }
         },
-        {
-            "kind": "ImageStream",
-            "apiVersion": "v1",
-            "metadata": {
-                "name": "${APP_NAME}",
-                "annotations": {
-                    "openshift.io/display-name": "Application ${APP_NAME}",
-                    "openshift.io/generated-by": "STARTX"
-                },
-                "labels": {
-                    "base-image": "sxapi",
-                    "app": "${APP_NAME}",
-                    "type": "${APP_TYPE}",
-                    "provider": "startx"
-                }
-            },
-            "spec": {
-                "tags": [
-                    {
-                        "name": "latest",
-                        "annotations": {
-                            "openshift.io/display-name": "Application ${APP_NAME}",
-                            "description": "Base image for the application ${APP_NAME}",
-                            "iconClass": "icon-nodejs",
-                            "tags": "startx,alpine,nodejs,sxapi-latest,application,${APP_NAME}",
-                            "supports": "sxapi:latest,nodejs,http",
-                            "version": "latest"
-                        }
-                    }
-                ]
-            }
-        },
         {
             "kind": "DeploymentConfig",
             "apiVersion": "v1",
@@ -159,7 +138,7 @@
                         "containers": [
                             {
                                 "name": "${APP_NAME}",
-                                "image": "startx/sxapi@sha256:d39be654d7336f665e8901c543ebf363baff093c5d21d6d24e4a3405629eeb40",
+                                "image": "startx/sxapi@sha256:a553b19f6858737f1b2cef8946aa260a9ba34a995ffca12fc25f380e58703544",
                                 "command": [
                                     "start"
                                 ],
@@ -329,7 +308,7 @@
                     "sourceStrategy": {
                         "from": {
                             "kind": "ImageStreamTag",
-                            "name": "sxapi:latest"
+                            "name": "${APP_NAME}:sxapi"
                         },
                         "env": [
                             {
@@ -357,7 +336,7 @@
             "name": "APP_NAME",
             "displayName": "Application name",
             "description": "The name of the created application",
-            "value": "sxapi",
+            "value": "app",
             "required": true
         },
         {

diff --git a/openshift-template-dc.json b/openshift-template-dc.json
@@ -247,7 +247,7 @@
             "name": "APP_NAME",
             "displayName": "Application name",
             "description": "The name of the created application",
-            "value": "sxapi",
+            "value": "app",
             "required": true
         },
         {