Codewind fix (#11)

* Move travis environment processing into guarded scripts (appsody#298)

* Move travis environment processing into guarded scripts

Remove use of `set -e` as it prevents recovering from errors
from invoked commands.

Signed-off-by: Erin Schnabel <[email protected]>

* review comments

Signed-off-by: Erin Schnabel <[email protected]>

* Restart on trigger (appsody#314)

* Restart on trigger

* Update versions

* Update index.yaml (appsody#316)

Signed-off-by Neeraj Laad <[email protected]>

* Allow specific collection's docker images to be built

By setting STACKS_LIST specific collections will be able to be  built.
If set to " "  (space) then no images will be built.

Signed-off-by: Steve Groeger <[email protected]>

* Update to allow stack name to use IMAGE_REGISTRY_ORG

Signed-off-by: Steve Groeger <[email protected]>

* proof readme

* suppress maven progress output for microprofile (appsody#320)

Signed-off-by: Erin Schnabel <[email protected]>

* review comments

* Update readme

* proof readme

* ubuntu has backlevel maven. Use -B (appsody#322)

Signed-off-by: Erin Schnabel <[email protected]>

* suppress maven progress output for Spring+Liberty (appsody#319)

Signed-off-by: Erin Schnabel <[email protected]>

* suppress maven progress output for vertx (appsody#317)

Signed-off-by: Erin Schnabel <[email protected]>

* Fix issues with README.md wording

* Update github templates for Kabanero

Signed-off-by: Steve Groeger <[email protected]>

* Add .md describing the collections repo structure

Signed-off-by: Steve Groeger <[email protected]>

* suppress maven progress output for quarkus (appsody#318)

Signed-off-by: Erin Schnabel <[email protected]>

* Update .md based on review comments.

* Run appsody commands (build, run, stop) for specified stacks (appsody#323)

Provide basic contents in test.sh to ensure that stack templates
can be run, and that projects can be extracted and built using
the stack.

Travis builds:
- Install appsody CLI if missing.
- Use a subset of known stacks when nothing else is specified
- Wrap long-running commands to prevent exit from no console output

Signed-off-by: Erin Schnabel <[email protected]>

* aadeshpa updated with buildah instead of kanino in build task

* Mp version range (appsody#329)

* Add version range to mp stack

* increase parent pom version

* Mp version range [fix] (appsody#336)

* Add version range to mp stack

* increase parent pom version

* Mvnw optional on java

* Revert "Mvnw optional on java"

This reverts commit c29bda5.

* make check_version executable

* Mp version range [fix] (appsody#337)

* Add version range to mp stack

* increase parent pom version

* Mvnw optional on java

* Revert "Mvnw optional on java"

This reverts commit c29bda5.

* make check_version executable

* install parent pom during build

* [ci] Fallback travis stack list; fix tests (appsody#326)

* Fallback travis stack list; fix tests

Signed-off-by: Erin Schnabel <[email protected]>

* Fail fast if image build fails

Signed-off-by: Erin Schnabel <[email protected]>

* Make init and build steps much quieter (appsody#338)

Signed-off-by: Erin Schnabel <[email protected]>

* source the release script (preserve shell) (appsody#339)

Signed-off-by: Erin Schnabel <[email protected]>

* Sbol version range (appsody#330)

* Add version range

* add missing xmlstarlet

* Make check_version executable

* add mvn install to docker build

* Sb optional mvnw (appsody#331)

* mvnw optional on java

* increase version

* Update to correctly allow xmlstarlet to be installed and tests to run

Signed-off-by: Steve Groeger <[email protected]>

* Fix issue with matching appsody repo

Signed-off-by: Steve Groeger <[email protected]>

* Update pre_list script to detect BUILD_ALL

Signed-off-by: Steve Groeger <[email protected]>

* Fix issue with mismatching repo names (appsody#342)

Signed-off-by: Steve Groeger <[email protected]>

* Set the codewind DISPLAY_NAME_PREFIX to be "Kabanero"

Signed-off-by: Steve Groeger <[email protected]>

* Use a variable as a prefix for the codewind index stack display names (appsody#343)

Signed-off-by: Steve Groeger <[email protected]>

* make mvnw optional on java (appsody#332)

* make mvnw optional on java (appsody#333)

* nodejs-express: added environment variable to production image (appsody#341)

* nodejs-express: added environment variable to production image

* bumped version

* added timeout value

* Fix path to pom.xml (appsody#345)

Fixes path to parent pom in init.sh
Signed-off-by Neeraj Laad <[email protected]

* vertx: allow version range (appsody#349)

* alter trigger behavior (appsody#353)

* Fix issue with excluded stacks being added to index

Signed-off-by: Steve Groeger <[email protected]>

* Update build-task.yaml to include collection validation

* formatting.

* Formatting.

* Move executable definitions for sha256cmd

Signed-off-by: Steve Groeger <[email protected]>

* Update docker image to point to kabanero

* Stop templates being built for stacks we are not building.

Signed-off-by: Steve Groeger <[email protected]>

* Update README.md

Update to not use `stacks` where `collections` should be used. Separate out the specific usages of Appsody stacks.

* nodejs-functions: fix typos in readme (appsody#370)

* fix: typos in readme

* docs: general typos

* python-flask: unset watch ignore directory (appsody#352)

* unset watch ignore directory

* Remove WATCH_IGNORE line entirely

* Update README.md to provide better info on testing locally.

Signed-off-by: Steve Groeger <[email protected]>

* Include the stack version for issues (appsody#375)

* Verbose mode with log capture (appsody#347)

Signed-off-by: Erin Schnabel <[email protected]>

* [java-spring-boot2] Use git and version data in stack image (appsody#325)

* Use git and stack information in stack image

Fix final Docker image:
- expose ports
- use exec so signals are passedto jvm

Signed-off-by: Erin Schnabel <[email protected]>

* Fix VERBOSE test, quote filenames

Signed-off-by: Erin Schnabel <[email protected]>

* Strip out unneeded steps due to latest Appsody changes

Signed-off-by: Steve Groeger <[email protected]>

* Update spring stack version (just stack.yaml!) (appsody#378)

Signed-off-by: Erin Schnabel <[email protected]>

* Keep index.yaml consistent with the kabanero-index.yaml in the latest
release

Signed-off-by: Steve Groeger <[email protected]>

* [python-flask] Move flask to 1.1.1, plus other minor cleanups (appsody#377)

* Move flask to 1.1.1, plus other minor cleanups

* Ensure debugger can connect (also bump version)

* updated v1 index (appsody#382)

* Move stack to open JDK

* [nodejs-functions] Manage functions that are not exported as GET (appsody#385)

* Fix: Manage functions that are not exported as GET

* Formatting: remove final line break

* Bump the version number in the stack.yaml

* Bump the version number in package.json

* Fix: return is called when any HTTP method found

"return" statement was executed after the GET check, making the rest of the code unreachable. Improved formatting.

* Formatting: use single quotes

* build: remove trailing slash if present in stacks list (appsody#383)

* build: remove trailing slash if present in stacks list

* renamed var

* Remove experimental collections as not supported by kabanero

Signed-off-by: Steve Groeger <[email protected]>

* Remove unsupported collections

Signed-off-by: Steve Groeger <[email protected]>

* Update readme.md to add info on creating a manual release

Signed-off-by: Steve Groeger <[email protected]>

* Ensure IMAGE_REGISTRY_ORG placeholder is substituted in collection.yaml

Signed-off-by: Steve Groeger <[email protected]>

* Resolve whitespace issue

Signed-off-by: Steve Groeger <[email protected]>

* Fix issue where templates were not built

Signed-off-by: Steve Groeger <[email protected]>

* vertx: define timeout seconds for readiness probe (appsody#399)

* Fix Build Script (appsody#406)

* Fix Build Script

* Encapsulate logic in if block

* nodejs-express: rename skaffold to scaffold (appsody#388)

* nodejs-express: rename skaffold to scaffold

* ver: update package.json ver number

* nodejs-express: add documentation on templates

* rust: initial version of rust stack (appsody#369)

* rust: initial version of rust stack

* simplified Dockerfile

* fixed dockerfile

* simplified dockerfile

* get name of generated binary

* cached dependencies

* expose port

* get name of generated binary inside dockerfile

* Use xmlstarlet instead of grep (appsody#395)

* Use Xmlstarlet, improve versioning (appsody#396)

* appsody#364 improve pom.xml by adopting agreed best practices (appsody#397)

* appsody#364 improve pom.xml by adopting agreed best practices

* appsody#364 improve pom.xml by adopting agreed best practices

* Update pom.xml

* Update stack.yaml

* loopback: define timeout seconds for readiness probe (appsody#398)

* java-microprofile Revert "appsody#364 improve pom.xml by adopting agreed best practices" (appsody#418)

* Revert "appsody#364 improve pom.xml by adopting agreed best practices (appsody#397)"

This reverts commit b3c5cb8.

* Update pom.xml

* Update stack.yaml

* Fix steps to clone collections locally

The user has to `cd collections` before `git` will recognize the collections repository to add a remote, or push.

* aadeshpa remove the volumeMounts for the validation step

* recompile on debug change (appsody#424)

* Provide an (additional) sample stack, one that is runnable by appsody (appsody#361)

* Initial runnable sample stack

* Allow build scripts to operate on samples

* Reference regular run env in change env

* Change APPSODY_INSTALL -> PREP

* Fix ENV names

* Fix up REGEX

* Remove unused PORT env variable

* Move sample to incubator

* undo travis/ci changes

* Clean up removal from samples

* rename stack to "starter"

* Remove experimental collections

Signed-off-by: Steve Groeger <[email protected]>

* initial changes

* disable tests

* [java-microprofile] Add javametrics as a dev only dependency (appsody#56)

* Add javametrics as a dev only dependency

* remove javametrics for test env var

* Remove the starter stack that was added by Appsody.

Signed-off-by: Steve Groeger <[email protected]>

* Update the VERSION and README.md files

Signed-off-by: Steve Groeger <[email protected]>

* Update CI scripts to correctly process the codewind json files for nginx

Signed-off-by: Steve Groeger <[email protected]>

* sync

ci/nginx/docker-compose.yml

@@ -16,7 +16,7 @@ services:
     image: "kabanero/kabanero-index"
     container_name: "kabanero-verify"
     entrypoint: ""
-    command: sh -c "/opt/startup.sh; cat /opt/www/public/*.yaml; ls /opt/www/public"
+    command: sh -c "/opt/startup.sh; cat /opt/www/public/*.yaml; cat /opt/www/public/*.json; ls /opt/www/public"
     environment:
       - EXTERNAL_URL=https://localhost:8003/
       - DRY_RUN=true

ci/nginx/startup.sh

@@ -9,6 +9,9 @@ fi
 # Replace the resource paths in index yaml files to match the specified external URL
 find /opt/www/public -name '*.yaml' -exec sed -i -e "s|{{EXTERNAL_URL}}|${EXTERNAL_URL%/}|" {} \;
 
+# Replace the resource paths in index json files to match the specified external URL
+find /opt/www/public -name '*.json' -exec sed -i -e "s|{{EXTERNAL_URL}}|${EXTERNAL_URL%/}|" {} \;
+
 if [ -z "${DRY_RUN}" ]
 then
     exec nginx $CONF_FILE

ci/package.sh

@@ -233,7 +233,16 @@ done
 exec_hooks $script_dir/ext/post_package.d
 
 if [ "$CODEWIND_INDEX" == "true" ]; then
-  python3 $script_dir/create_codewind_index.py $DISPLAY_NAME_PREFIX
+    python3 $script_dir/create_codewind_index.py $DISPLAY_NAME_PREFIX
+
+    # iterate over each repo
+    for codewind_file in $assets_dir/*.json
+    do
+        # flat json used by static appsody-index for codewind
+        index_src=$build_dir/index-src/$(basename "$codewind_file")
+
+        sed -e "s|${RELEASE_URL}/.*/|{{EXTERNAL_URL}}/|" $codewind_file > $index_src
+    done
 fi
 
 # create appsody-index from contents of assets directory after post-processing