diff options
| author | mo khan <mo.khan@gmail.com> | 2020-09-09 17:30:19 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-09-09 17:30:19 +0000 |
| commit | d4da2eff19bd210d18b0dbb80aa305c6a955a644 (patch) | |
| tree | 08a1b38c4fa8def3983f36900d81627f974027e6 /config | |
| parent | 442402496d0107fa69de61e966215e06f95506e8 (diff) | |
| parent | 91f0faf8dfc596dfde052763009fb520635e7fb1 (diff) | |
Merge branch 'gitlab-profile' into 'master'v3.25.3
Do not compress /usr/share
See merge request gitlab-org/security-products/license-management!215
Diffstat (limited to 'config')
| -rw-r--r-- | config/files/.bashrc | 1 | ||||
| -rw-r--r-- | config/install.sh | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/config/files/.bashrc b/config/files/.bashrc index 7017be5..61d4ecf 100644 --- a/config/files/.bashrc +++ b/config/files/.bashrc @@ -68,7 +68,6 @@ inflate /usr/include.tar.zst /usr inflate /usr/lib/gcc.tar.zst /usr/lib inflate /usr/lib/git-core.tar.zst /usr/lib inflate /usr/lib/llvm-7.tar.zst /usr/lib -inflate /usr/share.tar.zst /usr # shellcheck source=/dev/null . "$ASDF_DATA_DIR/asdf.sh" diff --git a/config/install.sh b/config/install.sh index 3e4c581..4e52827 100644 --- a/config/install.sh +++ b/config/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -exuo pipefail +set -euo pipefail export DEBIAN_FRONTEND=noninteractive @@ -127,7 +127,6 @@ tar --use-compress-program "$zstd_command" -cf /opt/gitlab/embedded.tar.zst embe cd /usr tar --use-compress-program "$zstd_command" -cf /usr/include.tar.zst include & -tar --use-compress-program "$zstd_command" -cf /usr/share.tar.zst share & cd /usr/lib tar --use-compress-program "$zstd_command" -cf /usr/lib/gcc.tar.zst gcc & @@ -145,6 +144,5 @@ rm -fr \ /usr/include \ /usr/lib/gcc \ /usr/lib/git-core \ - /usr/lib/llvm-7 \ - /usr/share + /usr/lib/llvm-7 echo -e "section_end:$(date +%s):compress_files\r\e[0K" |