diff options
| author | crupest <crupest@outlook.com> | 2024-08-14 00:28:12 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2024-08-14 00:29:21 +0800 |
| commit | 3b1e2001e28b5b6295fc51ef5490d459b694df69 (patch) | |
| tree | e784861c748910439705999257dce092419aaa9d /docker/crupest-debian-dev | |
| parent | 7f3a72fd3c12967f1f330de51b123f23990aaf6b (diff) | |
| download | crupest-3b1e2001e28b5b6295fc51ef5490d459b694df69.tar.gz crupest-3b1e2001e28b5b6295fc51ef5490d459b694df69.tar.bz2 crupest-3b1e2001e28b5b6295fc51ef5490d459b694df69.zip | |
fix(docker/debian-dev): mirror replace scripts on debian 12.
Diffstat (limited to 'docker/crupest-debian-dev')
5 files changed, 14 insertions, 8 deletions
diff --git a/docker/crupest-debian-dev/Dockerfile b/docker/crupest-debian-dev/Dockerfile index dd81997..a92ea4f 100644 --- a/docker/crupest-debian-dev/Dockerfile +++ b/docker/crupest-debian-dev/Dockerfile @@ -1,6 +1,6 @@ FROM debian:latest -ARG USERNAME= +ARG USERNAME=crupest ARG IN_CHINA= ARG SETUP_CODE_SERVER=true diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/get-domain.bash b/docker/crupest-debian-dev/bootstrap/apt-source/get-domain.bash index d44ea65..a24538c 100755 --- a/docker/crupest-debian-dev/bootstrap/apt-source/get-domain.bash +++ b/docker/crupest-debian-dev/bootstrap/apt-source/get-domain.bash @@ -2,4 +2,5 @@ set -e -sed "s|.*https\?://\([-_.a-zA-Z0-9]\+\)/.*|\\1|;q" /etc/apt/sources.list +grep -e 'URIs:' /etc/apt/sources.list.d/debian.sources | \ + sed -E 's|URIs:\s*https?://([-_.a-zA-Z0-9]+)/.*|\1|;q' diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/replace-domain.bash b/docker/crupest-debian-dev/bootstrap/apt-source/replace-domain.bash index 86e88dc..d55307c 100755 --- a/docker/crupest-debian-dev/bootstrap/apt-source/replace-domain.bash +++ b/docker/crupest-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 +echo "Backup /etc/apt/sources.list.d/debian.sources to /etc/apt/sources.list.d/debian.sources.bak." +echo "Replace source domain in /etc/apt/sources.list.d/debian.sources to $1." +sed -i.bak -E "s|(URIs:\\s*https?://)[-_.a-zA-Z0-9]+(/.*)|\\1$1\\2|" /etc/apt/sources.list.d/debian.sources diff --git a/docker/crupest-debian-dev/bootstrap/apt-source/replace-http.bash b/docker/crupest-debian-dev/bootstrap/apt-source/replace-http.bash index fae082a..ed4391d 100755 --- a/docker/crupest-debian-dev/bootstrap/apt-source/replace-http.bash +++ b/docker/crupest-debian-dev/bootstrap/apt-source/replace-http.bash @@ -2,6 +2,6 @@ set -e -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 +echo "Backup /etc/apt/sources.list to /etc/apt/sources.list.d/debian.sources.bak." +echo "Replace http to https in /etc/apt/sources.list.d/debian.sources." +sed -i.bak -E "s|(URIs:\\s*)https?(://[-_.a-zA-Z0-9]+/.*)|\\1https\\2|" /etc/apt/sources.list.d/debian.sources diff --git a/docker/crupest-debian-dev/bootstrap/wait.bash b/docker/crupest-debian-dev/bootstrap/wait.bash new file mode 100755 index 0000000..501c706 --- /dev/null +++ b/docker/crupest-debian-dev/bootstrap/wait.bash @@ -0,0 +1,5 @@ +#! /usr/bin/env bash + +set -e + +tail -f /dev/null |