Skip to content

Commit f5097d1

Browse files
committed
Fix: sshd fails to start in GitLab 18.0.2 container (#7218)
1 parent b64c0f4 commit f5097d1

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

terraform/gitlab/gitlab.tf.json.template.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,10 +1793,6 @@ def merge(sets: Iterable[Iterable[str]]) -> Iterable[str]:
17931793
# the same purpose as firewall rules in the
17941794
# guest OS.
17951795
'ExecStartPre=/sbin/nft flush ruleset',
1796-
# FIXME: Re-enable FIPS mode in GitLab container
1797-
# https://github.com/DataBiosphere/azul/issues/7218
1798-
f'ExecStartPre=/bin/mkdir -p {gitlab_mount}/etc',
1799-
f'ExecStartPre=/bin/sh -c "echo 0 > {gitlab_mount}/etc/fips_enabled"',
18001796
jw(
18011797
'ExecStart=/usr/bin/docker',
18021798
'run',
@@ -1809,9 +1805,6 @@ def merge(sets: Iterable[Iterable[str]]) -> Iterable[str]:
18091805
f'--volume {gitlab_mount}/config:/etc/gitlab',
18101806
f'--volume {gitlab_mount}/logs:/var/log/gitlab',
18111807
f'--volume {gitlab_mount}/data:/var/opt/gitlab',
1812-
# FIXME: Re-enable FIPS mode in GitLab container
1813-
# https://github.com/DataBiosphere/azul/issues/7218
1814-
f'--volume {gitlab_mount}/etc/fips_enabled:/proc/sys/crypto/fips_enabled',
18151808
*vpc_dns_docker_flags,
18161809
str(gitlab_image)
18171810
),

0 commit comments

Comments
 (0)