From 505c291656d3e196070ce5ee2484cd102e5d1998 Mon Sep 17 00:00:00 2001 From: Daniel Sotirhos Date: Mon, 4 Nov 2024 08:57:10 -0800 Subject: [PATCH] Add FIXME (#6675) --- .dockerignore | 2 ++ .gitignore | 2 ++ Dockerfile | 2 ++ Makefile | 2 ++ environment.py | 3 +++ 5 files changed, 11 insertions(+) diff --git a/.dockerignore b/.dockerignore index a92dc8c396..716a19c82e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,5 +3,7 @@ !common.mk !requirements*.txt !bin/keys/docker-apt-keyring.pgp +# FIXME: Remove fips_enabled +# https://github.com/DataBiosphere/azul/issues/6675 !fips_enabled requirements.all.txt diff --git a/.gitignore b/.gitignore index 4c6524d710..40a8a7d646 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ __pycache__/ /.coverage /.coverage.* /fedramp_inventory.xlsx +# FIXME: Remove fips_enabled +# https://github.com/DataBiosphere/azul/issues/6675 /fips_enabled ## Build products above this line. Please see the `clean` target in Makefile. diff --git a/Dockerfile b/Dockerfile index 09e14acb5c..4edfeda8e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,8 @@ RUN mkdir terraform \ RUN install -m 0755 -d /etc/apt/keyrings COPY --chmod=0644 bin/keys/docker-apt-keyring.pgp /etc/apt/keyrings/docker.gpg ARG azul_docker_version +# FIXME: Remove mounting of fips_enabled +# https://github.com/DataBiosphere/azul/issues/6675 ARG azul_proc_sys_crypto RUN --mount=type=bind,source=fips_enabled,target=${azul_proc_sys_crypto}/fips_enabled \ set -o pipefail \ diff --git a/Makefile b/Makefile index 2da01ebbeb..df9d622a9e 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,8 @@ $(eval $(call requirements,_runtime_deps,requirements_pip,,)) define docker .PHONY: docker$1 docker$1: check_docker + # FIXME: Remove creation of fips_enabled + # https://github.com/DataBiosphere/azul/issues/6675 echo 0 > fips_enabled docker build \ --build-arg azul_docker_registry=$$(azul_docker_registry) \ diff --git a/environment.py b/environment.py index 572db6d73e..16614cd052 100644 --- a/environment.py +++ b/environment.py @@ -270,6 +270,9 @@ def env() -> Mapping[str, Optional[str]]: # command `apt-get update` to succeed which would otherwise fail on # Debian bookworm with FIPS mode enabled. # + # FIXME: Remove azul_proc_sys_crypto + # https://github.com/DataBiosphere/azul/issues/6675 + # 'azul_proc_sys_crypto': '/tmp', # A dictionary mapping the short name of each Docker image used in Azul