Skip to content

Commit 9b58bd1

Browse files
committed
troubleshooting gitlab build and digest differ
1 parent 9a72a71 commit 9b58bd1

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

nix/oci.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
mkdir -p /tmp
7676
chmod 1777 /tmp
7777
# Normalize transient Nix state dirs for reproducible image layers.
78-
rm -rf nix/var || true
78+
rmdir nix/var/nix/builds nix/var/nix nix/var 2>/dev/null || true
7979
'';
8080
enableFakechroot = true;
8181

@@ -110,7 +110,7 @@
110110
mkdir -p var/lib/postgresql/data
111111
mkdir -p var/run/postgresql
112112
chown -R 999:999 var/lib/postgresql var/run/postgresql
113-
rm -rf nix/var || true
113+
rmdir nix/var/nix/builds nix/var/nix nix/var 2>/dev/null || true
114114
'';
115115
enableFakechroot = true;
116116

0 commit comments

Comments
 (0)