mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-13 22:42:29 +03:00
Merge branch 'https-apt' into 'master'
gitlab-ci: always use HTTPS for apt repos See merge request fdroid/fdroidserver!1450
This commit is contained in:
commit
07a0bd7314
1 changed files with 7 additions and 1 deletions
|
@ -76,7 +76,13 @@ metadata_v0:
|
||||||
'Dpkg::Use-Pty "0";'
|
'Dpkg::Use-Pty "0";'
|
||||||
'quiet "1";'
|
'quiet "1";'
|
||||||
>> /etc/apt/apt.conf.d/99gitlab
|
>> /etc/apt/apt.conf.d/99gitlab
|
||||||
|
# Ubuntu and other distros often lack https:// support
|
||||||
|
- grep Debian /etc/issue.net
|
||||||
|
&& { find /etc/apt/sources.list* -type f | xargs sed -i s,http:,https:, ; }
|
||||||
|
- echo 'Acquire::https::Verify-Peer "false";' > /etc/apt/apt.conf.d/99nocacertificates
|
||||||
- apt-get update
|
- apt-get update
|
||||||
|
- apt-get install ca-certificates
|
||||||
|
- rm /etc/apt/apt.conf.d/99nocacertificates
|
||||||
- apt-get dist-upgrade
|
- apt-get dist-upgrade
|
||||||
|
|
||||||
|
|
||||||
|
@ -641,7 +647,7 @@ docker:
|
||||||
- buildserver/*
|
- buildserver/*
|
||||||
variables:
|
variables:
|
||||||
- $CI_COMMIT_BRANCH == "master" || $CI_PROJECT_NAMESPACE != "fdroid"
|
- $CI_COMMIT_BRANCH == "master" || $CI_PROJECT_NAMESPACE != "fdroid"
|
||||||
image: docker:git
|
image: docker:dind
|
||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
variables:
|
variables:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue