upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 05:25:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14394 from danfengliu/remove-python3.6

Browse Source 
[Cherry-pick 2.2.0] Remove python3.6 and set dns for docker
This commit is contained in:
Daniel Jiang 2021-03-12 09:42:23 +08:00 committed by GitHub
commit a7f2465e3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/ci/api_common_install.sh
View File

@ -15,13 +15,38 @@ python --version
pip -V
cat /etc/issue
cat /proc/version
sudo apt-get update -y && sudo apt-get install -y python3.6
sudo rm /usr/bin/python && sudo ln -s /usr/bin/python3.6 /usr/bin/python
sudo apt-get install -y python3-pip
pip -V
sudo -H pip install --ignore-installed urllib3 chardet requests --upgrade
python --version
#---------------Set DNS for docker v20----------------------#
# In docker v20, it fixed an issue named "Wrong resolv.conf
# used on Ubuntu 19", this fix caused DNS solve problem
# in container. So the current work round is read DNS server
# from system and set the value in /etc/docker/daemon.json.
ip addr
dns_ip=$(netplan ip leases eth0 | grep -i dns | awk -F = '{print $2}')
dns_ip_list=$(echo $dns_ip | tr " " "\n")
dns_cfg=""
for ip in $dns_ip_list
do
dns_cfg="$dns_cfg,\"$ip\""
done
cat /etc/docker/daemon.json
if [ $(cat /etc/docker/daemon.json |grep \"dns\" |wc -l) -eq 0 ];then
sudo sed "s/}/,\n \"dns\": [${dns_cfg:1}]\n}/" -i /etc/docker/daemon.json
fi
cat /etc/docker/daemon.json
sudo systemctl daemon-reload
sudo systemctl restart docker
sudo systemctl status docker
#-------------------------------------------------------------#
sudo ./tests/hostcfg.sh
if [ "$2" = 'LDAP' ]; then