From 17ecde31734459bd63b6e02ca47c921892421329 Mon Sep 17 00:00:00 2001 From: Alex Pyrgiotis Date: Tue, 25 Jul 2023 10:29:20 +0300 Subject: [PATCH] dev_scripts: Fix wrong usage of Dockerfile snippet When building the *end-user* environment for Ubuntu Lunar using `./dev_scripts/env.py ... build`, we erroneously used a Dockerfile snippet that is actually reserved for the *development* environment. This pairing worked by chance, but we should use the proper Dockerfile snippet, so that we don't mix these two environments. --- dev_scripts/env.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_scripts/env.py b/dev_scripts/env.py index 7b57014..ba33dfd 100755 --- a/dev_scripts/env.py +++ b/dev_scripts/env.py @@ -455,7 +455,7 @@ class Env: ) elif self.distro == "ubuntu" and self.version in ("23.04", "lunar"): install_deps = ( - DOCKERFILE_UBUNTU_2304_REM_USER + DOCKERFILE_BUILD_DEV_DEBIAN_DEPS + DOCKERFILE_UBUNTU_2304_REM_USER + DOCKERFILE_BUILD_DEBIAN_DEPS ) package = f"dangerzone_{version}-1_all.deb" package_src = git_root() / "deb_dist" / package