From 1d2e409c04537abdcfb2dc93fae289402dae0be0 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Tue, 12 Dec 2023 15:20:09 +0100 Subject: [PATCH 01/18] Create devcontainer.json Create devcontainer with image `registry.opensuse.org/opensuse/tumbleweed:latest` --- .devcontainer/devcontainer.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 000000000000..396e64569eef --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,5 @@ +{ + "image": "registry.opensuse.org/opensuse/tumbleweed:latest", + "features": { + } +} From 8dfc8ace907a8d6923d6ac0ac54409eaa0f5c202 Mon Sep 17 00:00:00 2001 From: Michele Pagot Date: Tue, 12 Dec 2023 16:45:19 +0000 Subject: [PATCH 02/18] Install dependency in codespace Add link to install dependency script in the devcontainer: some of them are from suggestions from CONTRIBUTING.md, others are to fill the gap of what is missing to be able to run `make prepare` and `make test` after than. Add installation of som e(random) VSCode plugins about Perl and YAML. --- .devcontainer/devcontainer.json | 14 +++++++++++++- .devcontainer/install-dependencies.sh | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 .devcontainer/install-dependencies.sh diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 396e64569eef..04ea0146b247 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,17 @@ { "image": "registry.opensuse.org/opensuse/tumbleweed:latest", "features": { - } + }, + "customizations": { + "vscode": { + "extensions": [ + "streetsidesoftware.code-spell-checker", + "richterger.perl", + "ms-python.python", + "sfodje.perltidy", + "ms-vscode.makefile-tools" + ] + } + }, + "postCreateCommand": "install-dependencies.sh" } diff --git a/.devcontainer/install-dependencies.sh b/.devcontainer/install-dependencies.sh new file mode 100755 index 000000000000..dc2e3002b7ca --- /dev/null +++ b/.devcontainer/install-dependencies.sh @@ -0,0 +1,12 @@ +# Generic update +zypper dup -y + +# dependency suggested in the CONTRIBUTING.md +zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel + +# other dependency that are needed +zypper in -y make git python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel perl-Code-TidyAll + +# step suggested by the CONTRIBUTING.md +cd ${CODESPACE_VSCODE_FOLDER} +make prepare \ No newline at end of file From e213e641318e619cb601de2e77cfc089ea4483eb Mon Sep 17 00:00:00 2001 From: Michele Pagot Date: Tue, 12 Dec 2023 22:38:39 +0000 Subject: [PATCH 03/18] Fix the install-dependency call --- .devcontainer/devcontainer.json | 2 +- .devcontainer/install-dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 04ea0146b247..e76ea85d21a7 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,5 +13,5 @@ ] } }, - "postCreateCommand": "install-dependencies.sh" + "postCreateCommand": "./install-dependencies.sh" } diff --git a/.devcontainer/install-dependencies.sh b/.devcontainer/install-dependencies.sh index dc2e3002b7ca..9a160f21e877 100755 --- a/.devcontainer/install-dependencies.sh +++ b/.devcontainer/install-dependencies.sh @@ -5,7 +5,7 @@ zypper dup -y zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel # other dependency that are needed -zypper in -y make git python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel perl-Code-TidyAll +zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll # step suggested by the CONTRIBUTING.md cd ${CODESPACE_VSCODE_FOLDER} From 91dbd4ffeb43ec48cecd54ab24f0f8c260b1d486 Mon Sep 17 00:00:00 2001 From: Michele Pagot Date: Tue, 12 Dec 2023 22:50:41 +0000 Subject: [PATCH 04/18] More fix about calling the script --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e76ea85d21a7..9c9c574e9b58 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,5 +13,5 @@ ] } }, - "postCreateCommand": "./install-dependencies.sh" + "postCreateCommand": "${CODESPACE_VSCODE_FOLDER}/install-dependencies.sh" } From ca1070801a9dd4089d8aad8321f19ddf03e47dec Mon Sep 17 00:00:00 2001 From: Michele Pagot Date: Tue, 12 Dec 2023 23:58:27 +0000 Subject: [PATCH 05/18] Move to Dockerfile --- .devcontainer/Dockerfile | 11 +++++++++++ .devcontainer/devcontainer.json | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 000000000000..a62a328c1c66 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,11 @@ +# Use the specified image +FROM registry.opensuse.org/opensuse/tumbleweed:latest + +# Copy the script into the image +COPY install-dependency.sh /run/install-dependency.sh + +# Make the script executable +RUN chmod +x /run/install-dependency.sh + +# Run the script +RUN /run/install-dependency.sh \ No newline at end of file diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 9c9c574e9b58..6a4a682f17f8 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "image": "registry.opensuse.org/opensuse/tumbleweed:latest", + "build": { "dockerfile": "Dockerfile" }, "features": { }, "customizations": { @@ -13,5 +13,5 @@ ] } }, - "postCreateCommand": "${CODESPACE_VSCODE_FOLDER}/install-dependencies.sh" + "postCreateCommand": "echo "\--->>> $(pwd) <<<---\"", } From 99b2a52d8ebb773fc3b7f0b75d0a0359b619e0bc Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:05:15 +0000 Subject: [PATCH 06/18] fix postCreateCommand --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 6a4a682f17f8..51a1aedfb23c 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,5 +13,5 @@ ] } }, - "postCreateCommand": "echo "\--->>> $(pwd) <<<---\"", + "postCreateCommand": 'echo "--->>> $(pwd) <<<---"', } From ced42a1672f4d2732ed047b5c1607bf98d077695 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:10:12 +0000 Subject: [PATCH 07/18] Change path for the dependency script source --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a62a328c1c66..a829e96b52ff 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,7 +2,7 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest # Copy the script into the image -COPY install-dependency.sh /run/install-dependency.sh +COPY .devcontainer/install-dependency.sh /run/install-dependency.sh # Make the script executable RUN chmod +x /run/install-dependency.sh From bdc61ca4f95652029e4b8c0b370a0d694e0a6169 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:15:16 +0000 Subject: [PATCH 08/18] Remove dependency external script --- .devcontainer/Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a829e96b52ff..d4de5bbe35c5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,10 +2,16 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest # Copy the script into the image -COPY .devcontainer/install-dependency.sh /run/install-dependency.sh +#COPY .devcontainer/install-dependency.sh /run/install-dependency.sh # Make the script executable -RUN chmod +x /run/install-dependency.sh +#RUN chmod +x /run/install-dependency.sh # Run the script -RUN /run/install-dependency.sh \ No newline at end of file +#RUN /run/install-dependency.sh + +RUN zypper dup -y \ + zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel \ + zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll + #cd ${CODESPACE_VSCODE_FOLDER} + #make prepare \ No newline at end of file From 709c4e5ee7af0b45ebef3e9843e0aba91d873b06 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:22:25 +0000 Subject: [PATCH 09/18] Dockerfile fix --- .devcontainer/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d4de5bbe35c5..e4e9cbe4e3a8 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -11,7 +11,8 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest #RUN /run/install-dependency.sh RUN zypper dup -y \ - zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel \ - zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll + && zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel \ + && zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll \ + && echo "---------#########$(pwd)#########--------------" #cd ${CODESPACE_VSCODE_FOLDER} #make prepare \ No newline at end of file From d016059b46252d0daacb253e2b7129abad0d639f Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:28:02 +0000 Subject: [PATCH 10/18] More Dockerfile fixes --- .devcontainer/Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e4e9cbe4e3a8..d660103bf456 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -10,9 +10,10 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest # Run the script #RUN /run/install-dependency.sh -RUN zypper dup -y \ - && zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel \ - && zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll \ - && echo "---------#########$(pwd)#########--------------" - #cd ${CODESPACE_VSCODE_FOLDER} - #make prepare \ No newline at end of file +RUN zypper dup -y +RUN zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel +RUN zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll +RUN echo "---###--- ---###---" +RUN pwd +#cd ${CODESPACE_VSCODE_FOLDER} +#make prepare \ No newline at end of file From 834441877a54fe84560b6e93abb301ebb6c009b7 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:32:13 +0000 Subject: [PATCH 11/18] Debug Dockerfile --- .devcontainer/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d660103bf456..b9624d7e60bc 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -9,9 +9,10 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest # Run the script #RUN /run/install-dependency.sh - +RUN zypper lr RUN zypper dup -y -RUN zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel +RUN zypper lr +RUN zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel || echo "---zypper failure---" RUN zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll RUN echo "---###--- ---###---" RUN pwd From d9718270ed905d1c5cd2cc86120e4772b56734d9 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:37:56 +0000 Subject: [PATCH 12/18] More dockerfile fixes --- .devcontainer/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b9624d7e60bc..6b8b1288f944 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,17 +2,16 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest # Copy the script into the image -#COPY .devcontainer/install-dependency.sh /run/install-dependency.sh +COPY . /run/ # Make the script executable #RUN chmod +x /run/install-dependency.sh # Run the script #RUN /run/install-dependency.sh -RUN zypper lr RUN zypper dup -y RUN zypper lr -RUN zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel || echo "---zypper failure---" +RUN zypper in -y os-autoinst-distri-opensuse-deps perl-JSON-Validator gnu_parallel || echo "---zypper failure---" RUN zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll RUN echo "---###--- ---###---" RUN pwd From 836f89c56ec9f8d6eb39d5be9b8756a458362804 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:42:53 +0000 Subject: [PATCH 13/18] Move back to Dockerfile with dep script --- .devcontainer/Dockerfile | 18 +++++++++--------- .devcontainer/install-dependencies.sh | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 6b8b1288f944..1b0b708c10c1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -2,18 +2,18 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest # Copy the script into the image -COPY . /run/ +COPY . /tmp/ # Make the script executable -#RUN chmod +x /run/install-dependency.sh +RUN chmod +x /tmp/install-dependency.sh # Run the script -#RUN /run/install-dependency.sh -RUN zypper dup -y -RUN zypper lr -RUN zypper in -y os-autoinst-distri-opensuse-deps perl-JSON-Validator gnu_parallel || echo "---zypper failure---" -RUN zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll -RUN echo "---###--- ---###---" -RUN pwd +RUN /run/install-dependency.sh +#RUN zypper dup -y +#RUN zypper lr +#RUN zypper in -y os-autoinst-distri-opensuse-deps perl-JSON-Validator gnu_parallel || echo "---zypper failure---" +#RUN zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll +#RUN echo "---###--- ---###---" +#RUN pwd #cd ${CODESPACE_VSCODE_FOLDER} #make prepare \ No newline at end of file diff --git a/.devcontainer/install-dependencies.sh b/.devcontainer/install-dependencies.sh index 9a160f21e877..b6e61d7a4614 100755 --- a/.devcontainer/install-dependencies.sh +++ b/.devcontainer/install-dependencies.sh @@ -2,7 +2,7 @@ zypper dup -y # dependency suggested in the CONTRIBUTING.md -zypper in -y os-autoinst-distri-opensuse-deps-worker perl-JSON-Validator gnu_parallel +zypper in -y os-autoinst-distri-opensuse-deps perl-JSON-Validator gnu_parallel # other dependency that are needed zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll From d5d4cc380632444a45af16c535cf4e2bd19d7cfc Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:46:47 +0000 Subject: [PATCH 14/18] Fix dep script path --- .devcontainer/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 1b0b708c10c1..bfe9713701e3 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,10 +5,11 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest COPY . /tmp/ # Make the script executable -RUN chmod +x /tmp/install-dependency.sh +#RUN chmod +x /tmp/install-dependency.sh # Run the script -RUN /run/install-dependency.sh +RUN ls -lai /tmp/ +RUN /tmp/install-dependency.sh #RUN zypper dup -y #RUN zypper lr #RUN zypper in -y os-autoinst-distri-opensuse-deps perl-JSON-Validator gnu_parallel || echo "---zypper failure---" From 8c7496d1b73c6c2ee5d9967ffcd6c88c2c83c2e9 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:50:14 +0000 Subject: [PATCH 15/18] Use right dep script filename install-dependencies.sh --- .devcontainer/Dockerfile | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index bfe9713701e3..413bb48f4ad1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -4,17 +4,5 @@ FROM registry.opensuse.org/opensuse/tumbleweed:latest # Copy the script into the image COPY . /tmp/ -# Make the script executable -#RUN chmod +x /tmp/install-dependency.sh - # Run the script -RUN ls -lai /tmp/ -RUN /tmp/install-dependency.sh -#RUN zypper dup -y -#RUN zypper lr -#RUN zypper in -y os-autoinst-distri-opensuse-deps perl-JSON-Validator gnu_parallel || echo "---zypper failure---" -#RUN zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll -#RUN echo "---###--- ---###---" -#RUN pwd -#cd ${CODESPACE_VSCODE_FOLDER} -#make prepare \ No newline at end of file +RUN /tmp/install-dependencies.sh \ No newline at end of file From c65030b5577b0962c6ea97692f5e90964c8414ef Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 00:57:30 +0000 Subject: [PATCH 16/18] Debug make prepare and make execution current dir --- .devcontainer/install-dependencies.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.devcontainer/install-dependencies.sh b/.devcontainer/install-dependencies.sh index b6e61d7a4614..f732685e5bc4 100755 --- a/.devcontainer/install-dependencies.sh +++ b/.devcontainer/install-dependencies.sh @@ -8,5 +8,10 @@ zypper in -y os-autoinst-distri-opensuse-deps perl-JSON-Validator gnu_parallel zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbus-1-devel python311 python311-devel python311-yamllint python311-PyYAML perl-App-cpanminus perl-Code-TidyAll # step suggested by the CONTRIBUTING.md +echo "#########################################" +pwd + +echo "###### ${CODESPACE_VSCODE_FOLDER} #######" +ls -lai ${CODESPACE_VSCODE_FOLDER} cd ${CODESPACE_VSCODE_FOLDER} make prepare \ No newline at end of file From 00d8200f1ef4e06fbb196b3f83d254b3117095a8 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 01:02:23 +0000 Subject: [PATCH 17/18] Temporary remove make to debug CODESPACE_VSCODE_FOLDER --- .devcontainer/install-dependencies.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.devcontainer/install-dependencies.sh b/.devcontainer/install-dependencies.sh index f732685e5bc4..db5c55c7e95d 100755 --- a/.devcontainer/install-dependencies.sh +++ b/.devcontainer/install-dependencies.sh @@ -11,7 +11,9 @@ zypper in -y make git vim gcc-c++ libxml2-devel libssh2-devel libexpat-devel dbu echo "#########################################" pwd -echo "###### ${CODESPACE_VSCODE_FOLDER} #######" +echo "###### CODESPACE_VSCODE_FOLDER: ${CODESPACE_VSCODE_FOLDER} #######" +pwd +ls -lai . ls -lai ${CODESPACE_VSCODE_FOLDER} -cd ${CODESPACE_VSCODE_FOLDER} -make prepare \ No newline at end of file +#cd ${CODESPACE_VSCODE_FOLDER} +#make prepare \ No newline at end of file From 11eb15a57ad5a2596c8f3ed827e2694955669419 Mon Sep 17 00:00:00 2001 From: Michele Pagot <101880010+mpagot@users.noreply.github.com> Date: Wed, 13 Dec 2023 01:08:59 +0000 Subject: [PATCH 18/18] Postpone make prepare --- .devcontainer/devcontainer.json | 2 +- .devcontainer/install-dependencies.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 51a1aedfb23c..149f0b20d43f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,5 +13,5 @@ ] } }, - "postCreateCommand": 'echo "--->>> $(pwd) <<<---"', + "postCreateCommand": 'make prepare', } diff --git a/.devcontainer/install-dependencies.sh b/.devcontainer/install-dependencies.sh index db5c55c7e95d..e54992543e5f 100755 --- a/.devcontainer/install-dependencies.sh +++ b/.devcontainer/install-dependencies.sh @@ -15,5 +15,6 @@ echo "###### CODESPACE_VSCODE_FOLDER: ${CODESPACE_VSCODE_FOLDER} #######" pwd ls -lai . ls -lai ${CODESPACE_VSCODE_FOLDER} +ls -lai /workspaces || echo "### LATER ###" #cd ${CODESPACE_VSCODE_FOLDER} #make prepare \ No newline at end of file