Skip to content

Commit

Permalink
Add FIXME (#6675)
Browse files Browse the repository at this point in the history
  • Loading branch information
dsotirho-ucsc committed Dec 7, 2024
1 parent a69bfc0 commit 505c291
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
3 changes: 3 additions & 0 deletions environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 505c291

Please sign in to comment.