Skip to content
This repository has been archived by the owner on Nov 28, 2022. It is now read-only.

Appsody version bump + controller workaround #55

Merged
merged 9 commits into from
Nov 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions bin/pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
9 changes: 9 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions templatesProvider.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down