switch to upstream docker -- hopefully fixes ipv6 source address issues
This commit is contained in:
parent
a8f3a2fad8
commit
92bb25d2f0
5 changed files with 28 additions and 42 deletions
19
setup.sh
19
setup.sh
|
@ -123,13 +123,22 @@ if [[ "$(id -u)" != 0 ]]; then
|
|||
fatal "must be ran as root"
|
||||
fi
|
||||
|
||||
apt-get remove -y -q docker.io docker-doc docker-compose podman-docker containerd runc
|
||||
|
||||
mkdir -p /var/lib/stalwart-mail
|
||||
apt-get update -y -q
|
||||
apt-get install jq gettext-base diffutils -y -q
|
||||
apt-get install ca-certificates curl jq gettext-base diffutils -y -q
|
||||
# force using overlay2 driver so btrfs snapshots will snapshot the entire system and not miss all the docker stuff
|
||||
mkdir -p /etc/docker
|
||||
write_config --src templates/etc/docker/daemon.json --dest /etc/docker/daemon.json
|
||||
apt-get install certbot docker-compose docker.io sudo openssl crudini git ssl-cert curl -y -q
|
||||
write_config --src templates/etc/apt/sources.list.d/docker.list \
|
||||
--dest /etc/apt/sources.list.d/docker.list \
|
||||
--var dpkg_arch="$(dpkg --print-architecture)" \
|
||||
--var VERSION_CODENAME="$(. /etc/os-release && echo "$VERSION_CODENAME")"
|
||||
curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
|
||||
chmod a+r /etc/apt/keyrings/docker.asc
|
||||
apt-get update -y -q
|
||||
apt-get install certbot docker-ce docker-ce-cli containerd.io docker-compose-plugin sudo openssl crudini git ssl-cert -y -q
|
||||
if ((${#test_ca_list[@]})); then
|
||||
install -m 644 "${test_ca_list[0]}" /usr/local/share/ca-certificates/test-root.crt
|
||||
install -m 644 "${test_ca_list[1]}" /usr/local/share/ca-certificates/test-root2.crt
|
||||
|
@ -207,7 +216,7 @@ for _ in {0..30}; do
|
|||
done
|
||||
echo "server up"
|
||||
certbot_args=(certonly -n --email "postmaster@$BASE_DOMAIN_NAME" "--server=$ACME_SERVER_URL" --cert-name server --agree-tos --webroot --webroot-path /var/www)
|
||||
certbot_args+=(--disable-hook-validation --post-hook "cd '$wd' && docker-compose -p server restart")
|
||||
certbot_args+=(--disable-hook-validation --post-hook "cd '$wd' && docker compose -p server restart")
|
||||
for subdomain in "${subdomains[@]}"; do
|
||||
if [[ -n "$subdomain" ]]; then
|
||||
subdomain+=.
|
||||
|
@ -218,7 +227,7 @@ done
|
|||
retry_if_failed certbot "${certbot_args[@]}"
|
||||
trap EXIT
|
||||
docker stop "$nginx_container"
|
||||
DOCKER_BUILDKIT=1 docker-compose -p server up -d
|
||||
DOCKER_BUILDKIT=1 docker compose -p server up -d
|
||||
sleep 10
|
||||
if [[ -n "$mail_passwd_hash" ]]; then
|
||||
forgejo_smtp_passwd="$(crudini --get /etc/forgejo/app.ini mailer PASSWD)"
|
||||
|
@ -227,7 +236,7 @@ if [[ -n "$mail_passwd_hash" ]]; then
|
|||
curl -u "admin:$mail_passwd" "https://mail.$BASE_DOMAIN_NAME/api/dkim" --data-binary '{"id":null,"algorithm":"Rsa","domain":"'"$BASE_DOMAIN_NAME"'","selector":null}' > /dev/null
|
||||
stalwart-cli account create -d 'Admin Account' -i true -a "postmaster@$BASE_DOMAIN_NAME" 'admin' "$mail_passwd"
|
||||
stalwart-cli account create -d 'Forgejo Server' -i false -a "forgejo@$BASE_DOMAIN_NAME" 'forgejo' "$forgejo_smtp_passwd"
|
||||
add_postmaster=(docker-compose -p server exec -T -u git forgejo forgejo admin user create --admin --username postmaster --password "$mail_passwd" --email "postmaster@$BASE_DOMAIN_NAME")
|
||||
add_postmaster=(docker compose -p server exec -T -u git forgejo forgejo admin user create --admin --username postmaster --password "$mail_passwd" --email "postmaster@$BASE_DOMAIN_NAME")
|
||||
retry_if_failed -q "${add_postmaster[@]}"
|
||||
forum_smtp_passwd="$(sed 's/^ *DISCOURSE_SMTP_PASSWORD: "*\([^"]*\)"$/\1/p; d' < /var/discourse/containers/app.yml)"
|
||||
[[ -n "$forum_smtp_passwd" ]] || fatal "can't parse smtp password out of /var/discourse/containers/app.yml"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue