diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-08-07 12:51:11 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-08-07 12:51:11 +0000 |
| commit | 71e548e24191f9afe53f5679906d464b24c5c985 (patch) | |
| tree | f738829459a032079cf3afab3cc6cde895812c7c /config | |
| parent | dae67cdc5db97d87b90b76b3283b674edc052e16 (diff) | |
| parent | a89906bb5f31fd2cbc7762aaaa8f4d9955568c48 (diff) | |
Merge branch '217904-deb-docker' into 'master'v3.20.1
Package license management deb from deb job
See merge request gitlab-org/security-products/license-management!203
Diffstat (limited to 'config')
| -rw-r--r-- | config/files/.bashrc | 1 | ||||
| -rw-r--r-- | config/files/.config/NuGet/NuGet.Config | 2 | ||||
| -rw-r--r-- | config/files/.gradle/init.gradle | 2 | ||||
| -rw-r--r-- | config/files/.m2/settings.xml | 2 | ||||
| -rw-r--r-- | config/install.sh | 1 |
5 files changed, 5 insertions, 3 deletions
diff --git a/config/files/.bashrc b/config/files/.bashrc index 388f93d..fa70e9c 100644 --- a/config/files/.bashrc +++ b/config/files/.bashrc @@ -71,6 +71,7 @@ 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/lib/rustlib.tar.zst /usr/lib +inflate /usr/share.tar.zst /usr # shellcheck source=/dev/null . "$ASDF_DATA_DIR/asdf.sh" diff --git a/config/files/.config/NuGet/NuGet.Config b/config/files/.config/NuGet/NuGet.Config index 449478c..48a1fd4 100644 --- a/config/files/.config/NuGet/NuGet.Config +++ b/config/files/.config/NuGet/NuGet.Config @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <configuration> <config> - <add key="repositoryPath" value="/root/.nuget/packages" /> + <add key="repositoryPath" value="/opt/gitlab/.nuget/packages" /> </config> <packageSources> <add key="nuget.org" value="https://api.nuget.org/v3/index.json" /> diff --git a/config/files/.gradle/init.gradle b/config/files/.gradle/init.gradle index b8cc7f1..1a27cde 100644 --- a/config/files/.gradle/init.gradle +++ b/config/files/.gradle/init.gradle @@ -1,6 +1,6 @@ initscript { repositories { - maven { url uri('/root/.m2/repository') } + maven { url uri('/opt/gitlab/.m2/repository') } maven { url "https://plugins.gradle.org/m2" } } dependencies { diff --git a/config/files/.m2/settings.xml b/config/files/.m2/settings.xml index 9a89d90..34844ad 100644 --- a/config/files/.m2/settings.xml +++ b/config/files/.m2/settings.xml @@ -1,5 +1,5 @@ <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd"> - <localRepository>${user.home}/.m2/repository</localRepository> + <localRepository>/opt/gitlab/.m2/repository</localRepository> <interactiveMode>false</interactiveMode> <offline>false</offline> <profiles> diff --git a/config/install.sh b/config/install.sh index 8d555c4..62a64fd 100644 --- a/config/install.sh +++ b/config/install.sh @@ -190,6 +190,7 @@ 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/elixir.tar.zst elixir & |