Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(signing): Switch fully from
/usr/etc/
to /etc/
Fixes: #319 I only tested this in non-Universal Blue image. With & without rechunk. Before: ``` [11:39:42 g.i/h/rechunk:v1.0.1] => WARNING: FOUND /usr/etc. MERGING TO ETC FOR COMPATIBILITY [11:39:42 g.i/h/rechunk:v1.0.1] => EXPECT PERMISSIONS ISSUES ON THE MERGED PATHS [11:39:42 g.i/h/rechunk:v1.0.1] => The following files from /usr/etc will be merged to /etc: [11:39:42 g.i/h/rechunk:v1.0.1] => ./usr/etc [11:39:42 g.i/h/rechunk:v1.0.1] => |-- containers [11:39:42 g.i/h/rechunk:v1.0.1] => | |-- policy.json [11:39:42 g.i/h/rechunk:v1.0.1] => | `-- registries.d [11:39:42 g.i/h/rechunk:v1.0.1] => | `-- gidro-os.yaml [11:39:42 g.i/h/rechunk:v1.0.1] => `-- pki [11:39:42 g.i/h/rechunk:v1.0.1] => `-- containers [11:39:42 g.i/h/rechunk:v1.0.1] => `-- gidro-os.pub [11:39:42 g.i/h/rechunk:v1.0.1] => [11:39:42 g.i/h/rechunk:v1.0.1] => 5 directories, 3 files ``` After: ``` [18:26:31 g.i/h/rechunk:v1.0.1] => WARNING: FOUND /usr/etc. MERGING TO ETC FOR COMPATIBILITY [18:26:31 g.i/h/rechunk:v1.0.1] => EXPECT PERMISSIONS ISSUES ON THE MERGED PATHS [18:26:31 g.i/h/rechunk:v1.0.1] => The following files from /usr/etc will be merged to /etc: [18:26:31 g.i/h/rechunk:v1.0.1] => ./usr/etc [18:26:31 g.i/h/rechunk:v1.0.1] => `-- pki [18:26:31 g.i/h/rechunk:v1.0.1] => `-- containers [18:26:31 g.i/h/rechunk:v1.0.1] => `-- gidro-os.pub [18:26:31 g.i/h/rechunk:v1.0.1] => [18:26:31 g.i/h/rechunk:v1.0.1] => 3 directories, 1 file ``` Only thing remaining is to see if copying .pub keys to `/etc/` only will work, as it caused issues before. That would get rid of all files in `/usr/etc/`. https://github.com/blue-build/cli/blob/a8cac2adc90fa842e4565bc1825e588df4f5bcbd/template/templates/Containerfile.j2#L26
- Loading branch information