Merge pull request #97 from scottkurz/refactor-stack-release

Refactor stack release

Author: scottkurz

Diff for: .gitignore

@@ -1,5 +1,8 @@
 target/
 
+# generated from stack build.sh, not source
+generated/
+
 # eclipse specific git ignore
 *.pydevproject
 .project

Diff for: build.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 ####
 # For more documentation, see:
 #  https://github.com/OpenLiberty/application-stack/wiki/Open-Liberty-Application-Stack-Customization
@@ -21,24 +23,41 @@ OL_UBI_IMAGE="${OL_UBI_IMAGE:-openliberty/open-liberty:20.0.0.10-kernel-java11-o
 #
 # The name and tag of the "stack image you will build.  This will used to create your inner loop development containers, and also as the base image for the first stage of your outer loop image build.
 #
-STACK_IMAGE="${STACK_IMAGE:-openliberty/application-stack:0.3}"
+STACK_IMAGE="${STACK_IMAGE:-openliberty/application-stack:0.4}"
 
 #
 # URL at which your outer loop Dockerfile is hosted
 #
-DEVFILE_DOCKERFILE_LOC="${DEVFILE_DOCKERFILE_LOC:-https://raw.githubusercontent.com/OpenLiberty/application-stack/master/outer-loop/0.3/Dockerfile}"
+DEVFILE_DOCKERFILE_LOC="${DEVFILE_DOCKERFILE_LOC:-https://github.com/OpenLiberty/application-stack/releases/download/outer-loop-0.4.0-rc/Dockerfile}"
 
 #
 # URL at which your outer loop deploy YAML template is hosted
 #
-DEVFILE_DEPLOY_YAML_LOC="${DEVFILE_DEPLOY_YAML_LOC:-https://raw.githubusercontent.com/OpenLiberty/application-stack/master/outer-loop/0.3/app-deploy.yaml}"
-
-# Base customization.
-sed -e "s!{{.OL_RUNTIME_VERSION}}!$OL_RUNTIME_VERSION!; s!{{.STACK_IMAGE}}!$STACK_IMAGE!; s!{{.DEVFILE_DOCKERFILE_LOC}}!$DEVFILE_DOCKERFILE_LOC!; s!{{.DEVFILE_DEPLOY_YAML_LOC}}!$DEVFILE_DEPLOY_YAML_LOC!" src/devfile.yaml > devfile.yaml
-sed -e "s!{{.BASE_OS_IMAGE}}!$BASE_OS_IMAGE!; s!{{.OL_RUNTIME_VERSION}}!$OL_RUNTIME_VERSION!" src/stackimage/Dockerfile > stackimage/Dockerfile
-
-# Outer loop customization of Dockerfile
-sed -e "s!{{.STACK_IMAGE}}!$STACK_IMAGE!; s!{{.OL_UBI_IMAGE}}!$OL_UBI_IMAGE!" src/outer-loop/Dockerfile > outer-loop/latest/Dockerfile
-
-# Outer loop copy of app-deploy.yaml (no customization at present)
-cp src/outer-loop/app-deploy.yaml outer-loop/latest/app-deploy.yaml
+DEVFILE_DEPLOY_YAML_LOC="${DEVFILE_DEPLOY_YAML_LOC:-https://github.com/OpenLiberty/application-stack/releases/download/outer-loop-0.4.0-rc/app-deploy.yaml}"
+
+generate() {
+    # Base customization.
+    mkdir -p generated
+    sed -e "s!{{.OL_RUNTIME_VERSION}}!$OL_RUNTIME_VERSION!; s!{{.STACK_IMAGE}}!$STACK_IMAGE!; s!{{.DEVFILE_DOCKERFILE_LOC}}!$DEVFILE_DOCKERFILE_LOC!; s!{{.DEVFILE_DEPLOY_YAML_LOC}}!$DEVFILE_DEPLOY_YAML_LOC!" templates/devfile.yaml > generated/devfile.yaml
+    sed -e "s!{{.BASE_OS_IMAGE}}!$BASE_OS_IMAGE!; s!{{.OL_RUNTIME_VERSION}}!$OL_RUNTIME_VERSION!" templates/stackimage/Dockerfile > generated/stackimage-Dockerfile
+
+    # Outer loop customization of Dockerfile
+    sed -e "s!{{.STACK_IMAGE}}!$STACK_IMAGE!; s!{{.OL_UBI_IMAGE}}!$OL_UBI_IMAGE!" templates/outer-loop/Dockerfile > generated/Dockerfile
+}
+
+
+#set the action, default to generate if none passed.
+ACTION="generate"
+if [ $# -ge 1 ]; then
+    ACTION=$1
+    shift
+fi
+case "${ACTION}" in
+    generate)
+        generate
+    ;;
+    *)
+    echo "Invalid input action. Allowed values: generate. Default: generate."
+    exit 1
+    ;;
+esac

Diff for: devfile.yaml

@@ -0,0 +1,5 @@
+# NOTE
+
+The usage for the paths nested here has been superseded by the use of https://github.com/OpenLiberty/application-stack release URLs.  
+
+We keep this for now, for backwards compatibility for existing users, but will remove in the future.

Diff for: outer-loop/README.md

@@ -1,7 +1,7 @@
 schemaVersion: 2.0.0
 metadata:
   name: java-openliberty
-  version: 0.3.0
+  version: 0.4.0-rc
   description: Java application stack using Open Liberty runtime
   alpha.build-dockerfile: "{{.DEVFILE_DOCKERFILE_LOC}}"
   alpha.deployment-manifest: "{{.DEVFILE_DEPLOY_YAML_LOC}}"
@@ -13,8 +13,7 @@ starterProjects:
 components:
   - name: devruntime
     container:
-      # In the original upstream of this devfile, the image used is openliberty/application-stack:<x.y.z>, which is built from source at:
-      #   https://github.com/OpenLiberty/application-stack/tree/master/stackimage
+        # In the original upstream of this devfile, the image used is openliberty/application-stack:<x.y.z>, which is built from the repository: https://github.com/OpenLiberty/application-stack
       image: {{.STACK_IMAGE}}
       memoryLimit: 1512Mi
       mountSources: true