diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh index 851988fe..ea028e0b 100644 --- a/.devcontainer/setup.sh +++ b/.devcontainer/setup.sh @@ -4,7 +4,7 @@ set -x npm install -g @devcontainers/cli -pip install -e .[dev,generate] +pip install -e .[dev] apt-get -y install qemu binfmt-support qemu-user-static diff --git a/nanolayer/installers/apt_get/apt_get_installer.py b/nanolayer/installers/apt_get/apt_get_installer.py index 8ff5931f..92d33234 100644 --- a/nanolayer/installers/apt_get/apt_get_installer.py +++ b/nanolayer/installers/apt_get/apt_get_installer.py @@ -164,8 +164,9 @@ def install( ) if preserve_apt_list: + # Note: not using dir/* syntax as that doesnt work on 'sh' shell (alpine) Invoker.invoke( - command=f"mv {tempdir} /var/lib/apt/lists", + command=f"rm -r /var/lib/apt/lists && mv {tempdir} /var/lib/apt/lists", raise_on_failure=True, exception_class=cls.CleanUpFailed, )