From a8af79f7aaa82d60a133b82888fa92e69a3e699c Mon Sep 17 00:00:00 2001 From: Valeriy Svydenko Date: Mon, 6 Dec 2021 11:37:29 +0200 Subject: [PATCH] fix: generate devWorkspace files into /build/devfiles/{devfile_name} folder (#541) * fix: fix permission problem Signed-off-by: svor * fix: put generated files into /build/devfiles/ folder Signed-off-by: svor --- build/dockerfiles/Dockerfile | 1 - build/dockerfiles/rhel.Dockerfile | 1 - build/scripts/generate_devworkspace_templates.sh | 3 --- 3 files changed, 5 deletions(-) diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index ffe9adb60..bd223078d 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -32,7 +32,6 @@ RUN apk add --no-cache bash && \ apk add --no-cache coreutils COPY .htaccess README.md /usr/local/apache2/htdocs/ COPY --from=builder /build/devfiles /usr/local/apache2/htdocs/devfiles -COPY --from=builder /build/out /usr/local/apache2/htdocs/devfiles COPY ./images /usr/local/apache2/htdocs/images COPY ./build/dockerfiles/entrypoint.sh /usr/bin/ ENTRYPOINT ["/usr/bin/entrypoint.sh"] diff --git a/build/dockerfiles/rhel.Dockerfile b/build/dockerfiles/rhel.Dockerfile index 64c10014d..04bf50b72 100644 --- a/build/dockerfiles/rhel.Dockerfile +++ b/build/dockerfiles/rhel.Dockerfile @@ -85,7 +85,6 @@ WORKDIR /var/www/html RUN mkdir -m 777 /var/www/html/devfiles COPY .htaccess README.md /var/www/html/ COPY --from=builder /build/devfiles /var/www/html/devfiles -COPY --from=builder /build/out /var/www/html/devfiles COPY ./images /var/www/html/images COPY ./build/dockerfiles/rhel.entrypoint.sh ./build/dockerfiles/entrypoint.sh /usr/local/bin/ RUN chmod g+rwX /usr/local/bin/entrypoint.sh /usr/local/bin/rhel.entrypoint.sh diff --git a/build/scripts/generate_devworkspace_templates.sh b/build/scripts/generate_devworkspace_templates.sh index f6b500c9c..dfd02be06 100755 --- a/build/scripts/generate_devworkspace_templates.sh +++ b/build/scripts/generate_devworkspace_templates.sh @@ -15,9 +15,6 @@ do devfile=$(grep "v2:" "${dir}"meta.yaml) if [ -n "$devfile" ]; then devfile=${devfile##*v2: } - dir=${dir%/} - dir=/build/out/${dir##*/} - mkdir "${dir}" npx @eclipse-che/che-theia-devworkspace-handler --devfile-url:"${devfile}" --output-file:"${dir}"/devworkspace-che-theia-next.yaml npx @eclipse-che/che-theia-devworkspace-handler --devfile-url:"${devfile}" --editor:eclipse/che-theia/latest \ --output-file:"${dir}"/devworkspace-che-theia-latest.yaml