brammp/HomeServerCTs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Disabled Proxy by default and added custom proxy option to jeninsfile

Browse Source
This commit is contained in:
Bram Prieshof
2022-06-30 22:04:13 +02:00
parent 75a54c4fc2
commit 66e16943bc
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CT-Build/Alpine.Jenkinsfile
View File

@@ -8,6 +8,7 @@ pipeline {
booleanParam description: 'Only build specified variant', name: 'OneRun'
string defaultValue: 'VariantName', description: 'Variant for OneBuild', name: 'OneRunVariant'
booleanParam description: 'Disable of Proxy server for package repos ', name: 'DisProxy'
string defaultValue: '192.168.200.11', description: 'Proxy server for packages, (when enabled) ', name: 'ProxyServer'
}
options {
skipDefaultCheckout()
@@ -31,6 +32,9 @@ pipeline {
script{
if (env.DisProxy == 'true') {
sh '''bash Scripts/UpdateIMGBuildFile-CacheAndRepo.sh -d'''
} else {
env.ProxyServer = ProxyServer
sh '''bash Scripts/UpdateIMGBuildFile-CacheAndRepo.sh -e $ProxyServer'''
}
}
}

6
CT-Build/Alpine.yaml
View File

@@ -7,7 +7,7 @@ source:
same_as: 3.12
keyserver: keys.openpgp.org
#InitDownloadREPO
url: http://192.168.200.11/alpine/
url: http://dl-4.alpinelinux.org/alpine/
keys:
# 0482D84022F52DF1C4E7CD43293ACD0907D9495A
- |-
@@ -581,8 +581,8 @@ packages:
- name: /etc/apk/repositories
url: |-
#StartREPOS
http://192.168.200.11/alpine/v{{ image.release }}/main
http://192.168.200.11/alpine/v{{ image.release }}/community
http://dl-4.alpinelinux.org/alpine/v{{ image.release }}/main
http://dl-4.alpinelinux.org/alpine/v{{ image.release }}/community
#EndREPOS
{% if image.variant == "ddns" %}@TestingEdge http://dl-4.alpinelinux.org/alpine/edge/testing{% endif %}
{% if image.variant == "vouchproxy" %}@CommunityEdge http://dl-4.alpinelinux.org/alpine/edge/community{% endif %}

4
CT-Build/Debian.Jenkinsfile
View File

@@ -8,6 +8,7 @@ pipeline {
booleanParam description: 'Only build specified variant', name: 'OneRun'
string defaultValue: 'VariantName', description: 'Variant for OneBuild', name: 'OneRunVariant'
booleanParam description: 'Disable of Proxy server for package repos ', name: 'DisProxy'
string defaultValue: '192.168.200.11', description: 'Proxy server for packages, (when enabled) ', name: 'ProxyServer'
}
options {
skipDefaultCheckout()
@@ -31,6 +32,9 @@ pipeline {
script{
if (env.DisProxy == 'true') {
sh '''bash Scripts/UpdateIMGBuildFile-CacheAndRepo.sh -d'''
} else {
env.ProxyServer = ProxyServer
sh '''bash Scripts/UpdateIMGBuildFile-CacheAndRepo.sh -e $ProxyServer'''
}
}
}

4
CT-Build/Debian.yaml
View File

@@ -5,7 +5,7 @@ image:
source:
downloader: debootstrap
#InitDownloadREPO
url: http://192.168.200.11/deb.debian.org/debian
url: http://deb.debian.org/debian
keyserver: keys.openpgp.org
keys:
# 0x126C0D24BD8A2942CC7DF8AC7638D0442B90D010
@@ -1412,7 +1412,7 @@ actions:
echo 'APT::Install-Recommends "false";' > /etc/apt/apt.conf.d/01Recommends
echo 'APT::Install-Suggests "false";' > /etc/apt/apt.conf.d/01Suggests
#ProxyCacheSetting
echo 'Acquire::http::Proxy "http://192.168.200.11:80";' > /etc/apt/apt.conf.d/01prox
echo '#CacheServer not set' > /etc/apt/apt.conf.d/01prox
- trigger: post-packages
action: |-
#!/bin/sh