Ostatnio aktywny 6 months ago

Jan Wagner zrewidował ten Gist 2 years ago. Przejdź do rewizji

1 file changed, 2 insertions

docker_deploy.sh

@@ -57,3 +57,5 @@ fi
57 57 docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v /etc:/etc:ro -e MINIMUM_IMAGES_TO_SAVE=2 -e GRACE_PERIOD_SECONDS=432000 spotify/docker-gc | grep -v running
58 58 EOF
59 59 chmod +x /etc/cron.weekly/docker-cleanup
60 + # To update pinning, unattended upgrade config and updating docker compose, ctop and lazydocker
61 + # curl -o /tmp/autoupgrade_docker-ce_container.io.sh https://gist.githubusercontent.com/waja/01ba2641f93f461044f9/raw/autoupgrade_docker-ce_container.io.sh && bash /tmp/autoupgrade_docker-ce_container.io.sh && curl -o /tmp/deploy_addons.sh https://gist.githubusercontent.com/waja/01ba2641f93f461044f9/raw/deploy_addons.sh && bash /tmp/deploy_addons.sh

Jan Wagner zrewidował ten Gist 2 years ago. Przejdź do rewizji

1 file changed, 4 insertions

docker_deploy.sh

@@ -7,6 +7,10 @@ echo "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -c
7 7 apt-get install -y apt-transport-https ca-certificates bridge-utils curl sudo && \
8 8 if [ -d /etc/apt/trusted.gpg.d/ ]; then curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg; else apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0EBFCD88; fi && \
9 9 apt-get update; \
10 + # Deploy pinning and unatteded upgrade config for docker-ce and container.io
11 + # yes, we can do 'curl pipe bash', but this way we can adjust the script if something failes without redownload it
12 + curl -o /tmp/autoupgrade_docker-ce_container.io.sh https://gist.githubusercontent.com/waja/01ba2641f93f461044f9/raw/autoupgrade_docker-ce_container.io.sh && \
13 + bash /tmp/autoupgrade_docker-ce_container.io.sh && \
10 14 # Install docker and enable it
11 15 apt-get install -y docker-ce && \
12 16 systemctl enable docker && \

Jan Wagner zrewidował ten Gist 2 years ago. Przejdź do rewizji

1 file changed, 20 insertions

autoupgrade_docker-ce_container.io.sh(stworzono plik)

@@ -0,0 +1,20 @@
1 + #!/bin/bash
2 + cat <<EOF > /etc/apt/preferences.d/docker_pinning
3 + Package: docker-ce*
4 + Pin: version 5:23.0*
5 + Pin-Priority: 1000
6 +
7 + Package: containerd.io
8 + Pin: version 1.6*
9 + Pin-Priority: 1000
10 +
11 + Package: containerd.io
12 + Pin: release o=Docker
13 + Pin-Priority: -1
14 +
15 + Package: docker-ce*
16 + Pin: release o=Docker
17 + Pin-Priority: -1
18 + EOF
19 + [ ! $(grep -c "label=Docker CE" /etc/apt/apt.conf.d/50unattended-upgrades) -gt 0 ] && \
20 + sed -i '/-security,label=Debian-Security/a\ "origin=Docker,archive=${distro_codename},label=Docker CE";' /etc/apt/apt.conf.d/50unattended-upgrades

Jan Wagner zrewidował ten Gist 2 years ago. Przejdź do rewizji

2 files changed, 4 insertions, 4 deletions

deploy_addons.sh

@@ -1,6 +1,6 @@
1 1 #!/bin/bash
2 2 # Install docker compose
3 - aptitude install docker-compose-plugin
3 + apt-get install docker-compose-plugin
4 4 # Install docker compsoe switch
5 5 SWITCH_VER=$(curl -s -o /dev/null -I -w "%{redirect_url}\n" https://github.com/docker/compose-switch/releases/latest | grep -oP "[0-9]+(\.[0-9]+)+$") && \
6 6 curl -sSL https://github.com/docker/compose-switch/releases/download/v$SWITCH_VER/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch && chmod +x /usr/local/bin/compose-switch && \

docker_deploy.sh

@@ -4,11 +4,11 @@
4 4 echo "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > \
5 5 /etc/apt/sources.list.d/$(lsb_release -cs)-docker.list && \
6 6 # Install needed dependencies
7 - aptitude install -y apt-transport-https ca-certificates bridge-utils curl sudo && \
7 + apt-get install -y apt-transport-https ca-certificates bridge-utils curl sudo && \
8 8 if [ -d /etc/apt/trusted.gpg.d/ ]; then curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg; else apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0EBFCD88; fi && \
9 - aptitude update; \
9 + apt-get update; \
10 10 # Install docker and enable it
11 - aptitude install -y docker-ce && \
11 + apt-get install -y docker-ce && \
12 12 systemctl enable docker && \
13 13 # Allow to relay from local networks (where our containers are running)
14 14 sed -i 's#127.0.0.0/8#127.0.0.0/8 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16#' /etc/postfix/main.cf && \

Jan Wagner zrewidował ten Gist 3 years ago. Przejdź do rewizji

1 file changed, 9 insertions, 7 deletions

deploy_addons.sh

@@ -1,18 +1,20 @@
1 1 #!/bin/bash
2 2 # Install docker compose
3 - #COMPOSE_VER=$(curl -s -o /dev/null -I -w "%{redirect_url}\n" https://github.com/docker/compose/releases/latest | grep -oP "[0-9]+(\.[0-9]+)+$") && \
4 - #mkdir -p /usr/local/lib/docker/cli-plugins && curl -sSL https://github.com/docker/compose/releases/download/v$COMPOSE_VER/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
5 3 aptitude install docker-compose-plugin
6 4 # Install docker compsoe switch
7 5 SWITCH_VER=$(curl -s -o /dev/null -I -w "%{redirect_url}\n" https://github.com/docker/compose-switch/releases/latest | grep -oP "[0-9]+(\.[0-9]+)+$") && \
8 6 curl -sSL https://github.com/docker/compose-switch/releases/download/v$SWITCH_VER/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch && chmod +x /usr/local/bin/compose-switch && \
9 7 # Move old docker-compose v1 binary away
10 - if [ $(/usr/local/bin/docker-compose version | head -1 | grep -oP "[0-9]+(\.[0-9]+)+" | grep -c "^1") == 1 ]; then mv /usr/local/bin/docker-compose /usr/local/bin/docker-compose-v1; fi && \
8 + if [ -f /usr/local/bin/docker-compose ]; then
9 + if [ $(/usr/local/bin/docker-compose version | head -1 | grep -oP "[0-9]+(\.[0-9]+)+" | grep -c "^1") == 1 ]; then
10 + mv /usr/local/bin/docker-compose /usr/local/bin/docker-compose-v1;
11 + fi;
12 + fi && \
11 13 # Update alternative
12 - if [ ! -L /usr/local/bin/docker-compose ]; then update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/docker-compose-v1 1 && update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99; fi && \
13 - #[ -d /etc/bash_completion.d/ ] || mkdir -p /etc/bash_completion.d/ && \
14 - #curl -L https://raw.githubusercontent.com/docker/compose/${COMPOSE_VER}/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose && \
15 - #chmod +x /usr/local/bin/docker-compose && \
14 + if [ ! -L /usr/local/bin/docker-compose ]; then
15 + [ -f /usr/local/bin/compose-switch ] && update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99 && \
16 + [ -f /usr/local/bin/docker-compose-v1 ] && update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/docker-compose-v1
17 + fi;
16 18 # Install ctop
17 19 echo "deb http://packages.azlux.fr/debian/ buster main" | tee /etc/apt/sources.list.d/azlux.list && \
18 20 if [ -d /etc/apt/trusted.gpg.d/ ]; then curl -fsSL https://azlux.fr/repo.gpg.key | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/azlux.gpg; else curl -fsSL https://azlux.fr/repo.gpg.key | sudo apt-key add -; fi && \

Jan Wagner zrewidował ten Gist 3 years ago. Przejdź do rewizji

1 file changed, 4 insertions, 3 deletions

deploy_addons.sh

@@ -1,14 +1,15 @@
1 1 #!/bin/bash
2 2 # Install docker compose
3 - COMPOSE_VER=$(curl -s -o /dev/null -I -w "%{redirect_url}\n" https://github.com/docker/compose/releases/latest | grep -oP "[0-9]+(\.[0-9]+)+$") && \
4 - mkdir -p /usr/local/lib/docker/cli-plugins && curl -sSL https://github.com/docker/compose/releases/download/v$COMPOSE_VER/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
3 + #COMPOSE_VER=$(curl -s -o /dev/null -I -w "%{redirect_url}\n" https://github.com/docker/compose/releases/latest | grep -oP "[0-9]+(\.[0-9]+)+$") && \
4 + #mkdir -p /usr/local/lib/docker/cli-plugins && curl -sSL https://github.com/docker/compose/releases/download/v$COMPOSE_VER/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
5 + aptitude install docker-compose-plugin
5 6 # Install docker compsoe switch
6 7 SWITCH_VER=$(curl -s -o /dev/null -I -w "%{redirect_url}\n" https://github.com/docker/compose-switch/releases/latest | grep -oP "[0-9]+(\.[0-9]+)+$") && \
7 8 curl -sSL https://github.com/docker/compose-switch/releases/download/v$SWITCH_VER/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch && chmod +x /usr/local/bin/compose-switch && \
8 9 # Move old docker-compose v1 binary away
9 10 if [ $(/usr/local/bin/docker-compose version | head -1 | grep -oP "[0-9]+(\.[0-9]+)+" | grep -c "^1") == 1 ]; then mv /usr/local/bin/docker-compose /usr/local/bin/docker-compose-v1; fi && \
10 11 # Update alternative
11 - if [ ! -L /usr/local/bin/docker-compose ]; then update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/docker-compose-v1 1 && update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99 && \
12 + if [ ! -L /usr/local/bin/docker-compose ]; then update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/docker-compose-v1 1 && update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99; fi && \
12 13 #[ -d /etc/bash_completion.d/ ] || mkdir -p /etc/bash_completion.d/ && \
13 14 #curl -L https://raw.githubusercontent.com/docker/compose/${COMPOSE_VER}/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose && \
14 15 #chmod +x /usr/local/bin/docker-compose && \

Jan Wagner zrewidował ten Gist 3 years ago. Przejdź do rewizji

Brak zmian

Jan Wagner zrewidował ten Gist 3 years ago. Przejdź do rewizji

1 file changed, 1 insertion, 1 deletion

docker_deploy.sh

@@ -30,7 +30,7 @@ bash /tmp/deploy_addons.sh && \
30 30 # Blacklist container.io for needsrestart
31 31 [ -d /etc/needrestart/conf.d/ -a ! -f /etc/needrestart/conf.d/blacklist_rc.conf ] && \
32 32 cat > /etc/needrestart/conf.d/blacklist_rc.conf <<EOF
33 - $nrconf{blacklist_rc} = [
33 + \$nrconf{blacklist_rc} = [
34 34 qr(containerd.service),
35 35 ];
36 36 EOF

Jan Wagner zrewidował ten Gist 3 years ago. Przejdź do rewizji

1 file changed, 7 insertions

docker_deploy.sh

@@ -27,6 +27,13 @@ EOF
27 27 # Install docker-compose and ctop
28 28 curl -o /tmp/deploy_addons.sh https://gist.githubusercontent.com/waja/01ba2641f93f461044f9/raw/deploy_addons.sh && \
29 29 bash /tmp/deploy_addons.sh && \
30 + # Blacklist container.io for needsrestart
31 + [ -d /etc/needrestart/conf.d/ -a ! -f /etc/needrestart/conf.d/blacklist_rc.conf ] && \
32 + cat > /etc/needrestart/conf.d/blacklist_rc.conf <<EOF
33 + $nrconf{blacklist_rc} = [
34 + qr(containerd.service),
35 + ];
36 + EOF
30 37 # Add some cleanup jobs
31 38 cat > /etc/cron.weekly/docker-cleanup <<EOF
32 39 #!/bin/bash

Jan Wagner zrewidował ten Gist 4 years ago. Przejdź do rewizji

1 file changed, 13 insertions, 6 deletions

deploy_addons.sh

@@ -1,16 +1,23 @@
1 1 #!/bin/bash
2 - # Install docker-compose and bash completion
2 + # Install docker compose
3 3 COMPOSE_VER=$(curl -s -o /dev/null -I -w "%{redirect_url}\n" https://github.com/docker/compose/releases/latest | grep -oP "[0-9]+(\.[0-9]+)+$") && \
4 - curl -o /usr/local/bin/docker-compose -L https://github.com/docker/compose/releases/download/$COMPOSE_VER/docker-compose-$(uname -s)-$(uname -m) && \
5 - [ -d /etc/bash_completion.d/ ] || mkdir -p /etc/bash_completion.d/ && \
6 - curl -L https://raw.githubusercontent.com/docker/compose/${COMPOSE_VER}/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose && \
7 - chmod +x /usr/local/bin/docker-compose && \
4 + mkdir -p /usr/local/lib/docker/cli-plugins && curl -sSL https://github.com/docker/compose/releases/download/v$COMPOSE_VER/docker-compose-linux-x86_64 -o /usr/local/lib/docker/cli-plugins/docker-compose && chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
5 + # Install docker compsoe switch
6 + SWITCH_VER=$(curl -s -o /dev/null -I -w "%{redirect_url}\n" https://github.com/docker/compose-switch/releases/latest | grep -oP "[0-9]+(\.[0-9]+)+$") && \
7 + curl -sSL https://github.com/docker/compose-switch/releases/download/v$SWITCH_VER/docker-compose-linux-amd64 -o /usr/local/bin/compose-switch && chmod +x /usr/local/bin/compose-switch && \
8 + # Move old docker-compose v1 binary away
9 + if [ $(/usr/local/bin/docker-compose version | head -1 | grep -oP "[0-9]+(\.[0-9]+)+" | grep -c "^1") == 1 ]; then mv /usr/local/bin/docker-compose /usr/local/bin/docker-compose-v1; fi && \
10 + # Update alternative
11 + if [ ! -L /usr/local/bin/docker-compose ]; then update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/docker-compose-v1 1 && update-alternatives --install /usr/local/bin/docker-compose docker-compose /usr/local/bin/compose-switch 99 && \
12 + #[ -d /etc/bash_completion.d/ ] || mkdir -p /etc/bash_completion.d/ && \
13 + #curl -L https://raw.githubusercontent.com/docker/compose/${COMPOSE_VER}/contrib/completion/bash/docker-compose > /etc/bash_completion.d/docker-compose && \
14 + #chmod +x /usr/local/bin/docker-compose && \
8 15 # Install ctop
9 16 echo "deb http://packages.azlux.fr/debian/ buster main" | tee /etc/apt/sources.list.d/azlux.list && \
10 17 if [ -d /etc/apt/trusted.gpg.d/ ]; then curl -fsSL https://azlux.fr/repo.gpg.key | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/azlux.gpg; else curl -fsSL https://azlux.fr/repo.gpg.key | sudo apt-key add -; fi && \
11 18 apt update && \
12 19 apt install docker-ctop && \
13 20 # Install lazydocker
14 - curl -o /tmp/deploy_lazydocker.sh https://gist.githubusercontent.com/waja/be393038c754cff65d58850c1131d938/raw/deploy_lazydocker.sh && \
21 + curl -so /tmp/deploy_lazydocker.sh https://gist.githubusercontent.com/waja/be393038c754cff65d58850c1131d938/raw/deploy_lazydocker.sh && \
15 22 bash /tmp/deploy_lazydocker.sh && \
16 23 [ -f /usr/local/bin/ctop ] && rm -rf /usr/local/bin/ctop || exit 0 \