diff options
| author | crupest <crupest@outlook.com> | 2023-11-21 19:55:36 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2023-11-21 19:56:11 +0800 |
| commit | 31fd37e651d54af5ea8e4ef62fa95861c0c63242 (patch) | |
| tree | 9808dd8563771b3d1058386578b5d1d29a78a99a /docker | |
| parent | 32f8340d434342f8fb035a1c3816e816162197da (diff) | |
| download | crupest-31fd37e651d54af5ea8e4ef62fa95861c0c63242.tar.gz crupest-31fd37e651d54af5ea8e4ef62fa95861c0c63242.tar.bz2 crupest-31fd37e651d54af5ea8e4ef62fa95861c0c63242.zip | |
docker(debian-dev): improve apt-source.
Diffstat (limited to 'docker')
4 files changed, 13 insertions, 8 deletions
diff --git a/docker/debian-dev/bootstrap/apt-source/install-apt-https.bash b/docker/debian-dev/bootstrap/apt-source/install-apt-https.bash new file mode 100755 index 0000000..05d372b --- /dev/null +++ b/docker/debian-dev/bootstrap/apt-source/install-apt-https.bash @@ -0,0 +1,7 @@ +#! /usr/bin/env bash + +set -e + +echo "Install apt https transport." +apt-get update +apt-get install -y apt-transport-https ca-certificates diff --git a/docker/debian-dev/bootstrap/apt-source/replace-domain.bash b/docker/debian-dev/bootstrap/apt-source/replace-domain.bash index cef36a3..86e88dc 100755 --- a/docker/debian-dev/bootstrap/apt-source/replace-domain.bash +++ b/docker/debian-dev/bootstrap/apt-source/replace-domain.bash @@ -2,6 +2,6 @@ set -e +echo "Backup /etc/apt/sources.list to /etc/apt/sources.list.bak." +echo "Replace source domain in /etc/apt/sources.list to $1." sed -i.bak "s|\(https\?://\)[-_.a-zA-Z0-9]\+/|\\1$1/|" /etc/apt/sources.list -apt-get update - diff --git a/docker/debian-dev/bootstrap/apt-source/replace-http.bash b/docker/debian-dev/bootstrap/apt-source/replace-http.bash index b5f6cca..fae082a 100755 --- a/docker/debian-dev/bootstrap/apt-source/replace-http.bash +++ b/docker/debian-dev/bootstrap/apt-source/replace-http.bash @@ -2,9 +2,6 @@ set -e -apt-get update -apt-get install -y apt-transport-https ca-certificates - -sed -i.bak 's/https?/https/' /etc/apt/sources.list -apt-get update - +echo "Backup /etc/apt/sources.list to /etc/apt/sources.list.bak." +echo "Replace http to https in /etc/apt/sources.list." +sed -i.bak 's/https\?/https/' /etc/apt/sources.list diff --git a/docker/debian-dev/bootstrap/apt-source/setup.bash b/docker/debian-dev/bootstrap/apt-source/setup.bash index 9f74cb6..36065f6 100755 --- a/docker/debian-dev/bootstrap/apt-source/setup.bash +++ b/docker/debian-dev/bootstrap/apt-source/setup.bash @@ -8,5 +8,6 @@ if [[ -n $IN_CHINA ]]; then "$dir/replace-domain.bash" $(cat "$dir/china-source.txt") fi +"$dir/install-apt-https.bash" "$dir/replace-http.bash" |