almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-29 02:12:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Ctx mgr to ensure destuction of container-pip-deps.txt

Browse source 
The file container-pip-dependencies.txt was being left a directory when
building the docker image. This meant that it was being packaged when it
wasn't supposed to.

To avoid this, we remove file with the help from a context manager.

The change is minimal and the biggest part of the diff are indentation
changes.

Fixes #739
This commit is contained in:
deeplow 2024-03-04 13:44:32 +00:00
parent 4f08f99e93
commit 297feab63d
No known key found for this signature in database
GPG key ID: 577982871529A52A
1 changed files with 63 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
install/common/build-image.py
View file

@ -31,55 +31,54 @@ def main():
args = parser.parse_args() args = parser.parse_args()
print("Exporting container pip dependencies") print("Exporting container pip dependencies")
export_container_pip_dependencies() with ContainerPipDependencies():
print("Pulling base image")
print("Pulling base image") subprocess.run(
subprocess.run(
[
args.runtime,
"pull",
"alpine:latest",
],
check=True,
)
print("Building container image")
subprocess.run(
[
args.runtime,
"build",
BUILD_CONTEXT,
"--build-arg",
f"REQUIREMENTS_TXT={REQUIREMENTS_TXT}",
"-f",
"Dockerfile",
"--tag",
TAG,
],
check=True,
)
if not args.no_save:
print("Saving container image")
cmd = subprocess.Popen(
[ [
CONTAINER_RUNTIME, args.runtime,
"save", "pull",
TAG, "alpine:latest",
], ],
stdout=subprocess.PIPE, check=True,
) )
print("Compressing container image") print("Building container image")
chunk_size = 4 << 20 subprocess.run(
with gzip.open("share/container.tar.gz", "wb") as gzip_f: [
while True: args.runtime,
chunk = cmd.stdout.read(chunk_size) "build",
if len(chunk) > 0: BUILD_CONTEXT,
gzip_f.write(chunk) "--build-arg",
else: f"REQUIREMENTS_TXT={REQUIREMENTS_TXT}",
break "-f",
cmd.wait(5) "Dockerfile",
"--tag",
TAG,
],
check=True,
)
if not args.no_save:
print("Saving container image")
cmd = subprocess.Popen(
[
CONTAINER_RUNTIME,
"save",
TAG,
],
stdout=subprocess.PIPE,
)
print("Compressing container image")
chunk_size = 4 << 20
with gzip.open("share/container.tar.gz", "wb") as gzip_f:
while True:
chunk = cmd.stdout.read(chunk_size)
if len(chunk) > 0:
gzip_f.write(chunk)
else:
break
cmd.wait(5)
print("Looking up the image id") print("Looking up the image id")
image_id = subprocess.check_output( image_id = subprocess.check_output(
@ -97,18 +96,25 @@ def main():
f.write(image_id) f.write(image_id)
def export_container_pip_dependencies(): class ContainerPipDependencies:
try: """Generates PIP dependencies within container"""
container_requirements_txt = subprocess.check_output(
["poetry", "export", "--only", "container"], universal_newlines=True def __enter__(self):
) try:
except subprocess.CalledProcessError as e: container_requirements_txt = subprocess.check_output(
print("FAILURE", e.returncode, e.output) ["poetry", "export", "--only", "container"], universal_newlines=True
print(f"REQUIREMENTS: {container_requirements_txt}") )
# XXX Export container dependencies and exclude pymupdfb since it is not needed in container except subprocess.CalledProcessError as e:
req_txt_pymupdfb_stripped = container_requirements_txt.split("pymupdfb")[0] print("FAILURE", e.returncode, e.output)
with open(Path(BUILD_CONTEXT) / REQUIREMENTS_TXT, "w") as f: print(f"REQUIREMENTS: {container_requirements_txt}")
f.write(req_txt_pymupdfb_stripped) # XXX Export container dependencies and exclude pymupdfb since it is not needed in container
req_txt_pymupdfb_stripped = container_requirements_txt.split("pymupdfb")[0]
with open(Path(BUILD_CONTEXT) / REQUIREMENTS_TXT, "w") as f:
f.write(req_txt_pymupdfb_stripped)
def __exit__(self, exc_type, exc_value, exc_tb):
print("Leaving the context...")
os.remove(Path(BUILD_CONTEXT) / REQUIREMENTS_TXT)
if __name__ == "__main__": if __name__ == "__main__":