From 3b91703f19380acea0f1b219e09d727ebdb04d14 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 27 Nov 2019 14:48:26 -0800 Subject: [PATCH] Fix some issues with theia-docker-image build --- concourse/pipeline.yml | 2 +- concourse/tasks/prepare-theia-docker-image.sh | 4 ++++ concourse/tasks/prepare-theia-docker-image.yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index f9083c5ae..522806818 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -342,7 +342,7 @@ jobs: trigger: true - get: sts4 - task: prepare-theia-docker-image - file: tasks/prepare-theia-docker-image.yml + file: sts4/concourse/tasks/prepare-theia-docker-image.yml - name: build-docker-image serial: true diff --git a/concourse/tasks/prepare-theia-docker-image.sh b/concourse/tasks/prepare-theia-docker-image.sh index 749f48d29..cf1c434a5 100755 --- a/concourse/tasks/prepare-theia-docker-image.sh +++ b/concourse/tasks/prepare-theia-docker-image.sh @@ -1,8 +1,12 @@ #!/bin/bash set -e workdir=$(pwd) + +echo "workdir=${workdir}" + cp -R ${workdir}/sts4/concourse/theia-docker-image/* ${workdir}/output for i in ${workdir}/*-vsix-*/*.vsix ; do + echo "Adding plugin: $i" cp "$i" ${workdir}/output/plugins/ done diff --git a/concourse/tasks/prepare-theia-docker-image.yml b/concourse/tasks/prepare-theia-docker-image.yml index 8039b1aff..ad25690d6 100644 --- a/concourse/tasks/prepare-theia-docker-image.yml +++ b/concourse/tasks/prepare-theia-docker-image.yml @@ -12,4 +12,4 @@ inputs: outputs: - name: output run: - path: sts4/tasks/prepare-theia-docker-image.sh \ No newline at end of file + path: sts4/concourse/tasks/prepare-theia-docker-image.sh \ No newline at end of file