Appsody version bump + controller workaround (#55)

* define commands Signed-off-by: Andrew Mak <[email protected]> * rename Signed-off-by: Andrew Mak <[email protected]> * add directive Signed-off-by: Andrew Mak <[email protected]> * rename Signed-off-by: Andrew Mak <[email protected]> * controller workaround Signed-off-by: Andrew Mak <[email protected]> * pulling in 0.4.8 Signed-off-by: Andrew Mak <[email protected]> * backout some change Signed-off-by: Andrew Mak <[email protected]> * back out a change Signed-off-by: Andrew Mak <[email protected]>
eclipse-archived · Nov 1, 2019 · 7c9763a · 7c9763a
1 parent c649fc2
commit 7c9763a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/bin/README.md b/bin/README.md
@@ -2,5 +2,5 @@
 
 This Codewind Appsody extension includes the following releases of the Appsody executables:
 
-- Appsody: [0.4.7](https://github.com/appsody/appsody/releases/tag/0.4.7)
-- Appsody controller: [0.2.5](https://github.com/appsody/controller/releases/tag/0.2.5)
+- Appsody: [0.4.8](https://github.com/appsody/appsody/releases/tag/0.4.8)
+- Appsody controller: [0.2.6](https://github.com/appsody/controller/releases/tag/0.2.6)
diff --git a/bin/pull.sh b/bin/pull.sh
@@ -3,8 +3,8 @@
 set -e
 set -o pipefail
 
-default_appsody_version=0.4.7
-default_appsody_controller_version=0.2.5
+default_appsody_version=0.4.8
+default_appsody_controller_version=0.2.6
 
 appsody_version=${APPSODY_VERSION}
 appsody_controller_version=${APPSODY_CONTROLLER_VERSION}

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -294,6 +294,15 @@ elif [ "$COMMAND" == "rebuild" ]; then
 	create
 # Just return configuration information as last line of output
 else
+	# a temporary workaround until controller mount is no longer needed
+	if [ "$IN_K8" != "true" ]; then
+		tempBin="/mounted-workspace/.extensions/$EXT_NAME/bin"
+		if [ ! -f "$tempBin/appsody-controller" ]; then
+			mkdir -p $tempBin
+			cp "$DIR/bin/appsody-controller" $tempBin
+		fi
+	fi
+
 	stack=`grep "stack: " .appsody-config.yaml`
 	knStack=`$DIR/scripts/get-stack.sh "$stack"`
 	echo -n "{ \"language\": \"$knStack\" }" > $LOG_FOLDER/settings.json

diff --git a/templatesProvider.js b/templatesProvider.js
@@ -72,14 +72,11 @@ module.exports = {
 
         const projectTypes = [];
 
-        const result = await exec(`${__dirname}/appsody list -o json`);
+        const result = await exec(`${__dirname}/appsody list ${id} -o json`);
         const json = JSON.parse(result.stdout);
 
         for (const repo of json.repositories) {
-
-            if (repo.repositoryName == 'experimental')
-                continue;
-
+
             for (const stack of repo.stacks) {
 
                 projectTypes.push({