From 404da582fe5604835fb3b126acdd014e7bb20d94 Mon Sep 17 00:00:00 2001
From: Riccardo Balbo <riccardo0blb@gmail.com>
Date: Sat, 22 Feb 2025 13:47:02 +0100
Subject: [PATCH] more ghaction fixes

---
 .devcontainer/devcontainer.json |  3 ++-
 .devcontainer/pre-setup.sh      | 10 ++++++++++
 .devcontainer/setup.sh          |  8 +-------
 tests/integration/start.sh      |  2 ++
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 .devcontainer/pre-setup.sh

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5d69523..ab3aa91 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,12 +7,13 @@
   "mounts": [
     "source=${localWorkspaceFolder}/.devcontainer/start.sh,target=/start-lnbits.sh,type=bind",
     "source=${localWorkspaceFolder}/.devcontainer/setup.sh,target=/setup.sh,type=bind",
+    "source=${localWorkspaceFolder}/.devcontainer/pre-setup.sh,target=/pre-setup.sh,type=bind",
     "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
   ],
   "containerEnv": {
     "IS_DEV_CONTAINER": "true"
   },
-  "postCreateCommand": "/bin/bash /setup.sh ${containerWorkspaceFolder}",
+  "postCreateCommand": "/bin/bash /pre-setup.sh && /bin/bash /setup.sh ${containerWorkspaceFolder}",
   "postStartCommand": "/bin/bash /start-lnbits.sh",
   "customizations": {
     "vscode": {
diff --git a/.devcontainer/pre-setup.sh b/.devcontainer/pre-setup.sh
new file mode 100644
index 0000000..367a1e1
--- /dev/null
+++ b/.devcontainer/pre-setup.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+sudo apt update -y
+sudo apt install -y curl
+sudo apt-get install -y docker.io
+
+curl -fsSL https://deb.nodesource.com/setup_20.x -o /tmp/nodesource_setup.sh
+sudo bash /tmp/nodesource_setup.sh
+sudo apt-get install -y nodejs
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
index 7a8da6d..aac5e84 100644
--- a/.devcontainer/setup.sh
+++ b/.devcontainer/setup.sh
@@ -1,14 +1,8 @@
 #!/bin/bash
 echo $PYTHONPATH
+set -e
 CONTAINER_WORKSPACE_FOLDER=$1
 cd $CONTAINER_WORKSPACE_FOLDER
-sudo apt update -y
-sudo apt install -y curl
-sudo apt-get install -y docker.io
-
-curl -fsSL https://deb.nodesource.com/setup_20.x -o /tmp/nodesource_setup.sh
-sudo bash /tmp/nodesource_setup.sh
-sudo apt-get install -y nodejs
 
 cd $HOME
 echo $PWD
diff --git a/tests/integration/start.sh b/tests/integration/start.sh
index d6924d3..140f26a 100644
--- a/tests/integration/start.sh
+++ b/tests/integration/start.sh
@@ -42,6 +42,7 @@ docker run --name=lnbits_nwcprovider_ext_lnbits_test \
 -v ${PWD}/../../:/nwcprovider \
 -v ${PWD}/../../.devcontainer/start.sh:/start-lnbits.sh:ro \
 -v ${PWD}/../../.devcontainer/setup.sh:/setup.sh:ro \
+-v ${PWD}/../../.devcontainer/pre-setup.sh:/pre-setup.sh:ro \
 mcr.microsoft.com/devcontainers/python:1-3.12 bash -c "while true; do sleep 1000; done"
 
 docker network create lnbits_nwcprovider_ext_test_network || true
@@ -49,6 +50,7 @@ docker network connect lnbits_nwcprovider_ext_test_network lnbits_nwcprovider_ex
 docker network connect lnbits_nwcprovider_ext_test_network lnbits_nwcprovider_ext_lnbits_test --alias lnbits|| true
 
 docker exec -u root lnbits_nwcprovider_ext_lnbits_test bash -c "id -u $id &>/dev/null || useradd -m -u $id tester"
+docker exec -u root lnbits_nwcprovider_ext_lnbits_test bash -c "bash /pre-setup.sh"
 docker exec --user $id:$gid lnbits_nwcprovider_ext_lnbits_test  bash -c "curl -sSL https://install.python-poetry.org | python3 -"
 
 set +e