From 0657d01833b5395a752806a7484144d4ae22c635 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 21 Oct 2022 07:46:12 +0200 Subject: [PATCH] committing changes in /etc made by "apt remove --purge docker-ce" Package changes: -docker-ce 5:20.10.20~3-0~debian-bullseye amd64 --- .etckeeper | 4 - default/docker | 20 --- init.d/docker | 156 ------------------ init/docker.conf | 72 -------- rc0.d/K01docker | 1 - rc1.d/K01docker | 1 - rc2.d/S01docker | 1 - rc3.d/S01docker | 1 - rc4.d/S01docker | 1 - rc5.d/S01docker | 1 - rc6.d/K01docker | 1 - .../multi-user.target.wants/docker.service | 1 - .../system/sockets.target.wants/docker.socket | 1 - 13 files changed, 261 deletions(-) delete mode 100644 default/docker delete mode 100755 init.d/docker delete mode 100644 init/docker.conf delete mode 120000 rc0.d/K01docker delete mode 120000 rc1.d/K01docker delete mode 120000 rc2.d/S01docker delete mode 120000 rc3.d/S01docker delete mode 120000 rc4.d/S01docker delete mode 120000 rc5.d/S01docker delete mode 120000 rc6.d/K01docker delete mode 120000 systemd/system/multi-user.target.wants/docker.service delete mode 120000 systemd/system/sockets.target.wants/docker.socket diff --git a/.etckeeper b/.etckeeper index 79185dd9..c369b34b 100755 --- a/.etckeeper +++ b/.etckeeper @@ -733,7 +733,6 @@ maybe chmod 0644 'default/console-setup' maybe chmod 0644 'default/cron' maybe chmod 0644 'default/cryptdisks' maybe chmod 0644 'default/dbus' -maybe chmod 0644 'default/docker' maybe chmod 0644 'default/google-chrome' maybe chmod 0644 'default/grub' maybe chmod 0755 'default/grub.d' @@ -937,7 +936,6 @@ maybe chmod 0644 'hosts.deny' maybe chmod 0644 'idmapd.conf' maybe chmod 0755 'ifplugd' maybe chmod 0755 'ifplugd/action.d' -maybe chmod 0755 'init' maybe chmod 0755 'init.d' maybe chmod 0755 'init.d/alsa-utils' maybe chmod 0755 'init.d/anacron' @@ -956,7 +954,6 @@ maybe chmod 0755 'init.d/cryptdisks-early' maybe chmod 0755 'init.d/cups' maybe chmod 0755 'init.d/cups-browsed' maybe chmod 0755 'init.d/dbus' -maybe chmod 0755 'init.d/docker' maybe chmod 0755 'init.d/ftscanhv' maybe chmod 0755 'init.d/ftsprhv' maybe chmod 0755 'init.d/hwclock.sh' @@ -991,7 +988,6 @@ maybe chmod 0755 'init.d/uuidd' maybe chmod 0755 'init.d/vmware-USBArbitrator' maybe chmod 0755 'init.d/x11-common' maybe chmod 0755 'init.d/xinetd' -maybe chmod 0644 'init/docker.conf' maybe chmod 0755 'initramfs-tools' maybe chmod 0755 'initramfs-tools/conf.d' maybe chmod 0644 'initramfs-tools/conf.d/resume' diff --git a/default/docker b/default/docker deleted file mode 100644 index c4e93199..00000000 --- a/default/docker +++ /dev/null @@ -1,20 +0,0 @@ -# Docker Upstart and SysVinit configuration file - -# -# THIS FILE DOES NOT APPLY TO SYSTEMD -# -# Please see the documentation for "systemd drop-ins": -# https://docs.docker.com/engine/admin/systemd/ -# - -# Customize location of Docker binary (especially for development testing). -#DOCKERD="/usr/local/bin/dockerd" - -# Use DOCKER_OPTS to modify the daemon startup options. -#DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4" - -# If you need Docker to use an HTTP proxy, it can also be specified here. -#export http_proxy="http://127.0.0.1:3128/" - -# This is also a handy place to tweak where Docker's temporary files go. -#export DOCKER_TMPDIR="/mnt/bigdrive/docker-tmp" diff --git a/init.d/docker b/init.d/docker deleted file mode 100755 index 9c8fa6be..00000000 --- a/init.d/docker +++ /dev/null @@ -1,156 +0,0 @@ -#!/bin/sh -set -e - -### BEGIN INIT INFO -# Provides: docker -# Required-Start: $syslog $remote_fs -# Required-Stop: $syslog $remote_fs -# Should-Start: cgroupfs-mount cgroup-lite -# Should-Stop: cgroupfs-mount cgroup-lite -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Create lightweight, portable, self-sufficient containers. -# Description: -# Docker is an open-source project to easily create lightweight, portable, -# self-sufficient containers from any application. The same container that a -# developer builds and tests on a laptop can run at scale, in production, on -# VMs, bare metal, OpenStack clusters, public clouds and more. -### END INIT INFO - -export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin - -BASE=docker - -# modify these in /etc/default/$BASE (/etc/default/docker) -DOCKERD=/usr/bin/dockerd -# This is the pid file managed by docker itself -DOCKER_PIDFILE=/var/run/$BASE.pid -# This is the pid file created/managed by start-stop-daemon -DOCKER_SSD_PIDFILE=/var/run/$BASE-ssd.pid -DOCKER_LOGFILE=/var/log/$BASE.log -DOCKER_OPTS= -DOCKER_DESC="Docker" - -# Get lsb functions -. /lib/lsb/init-functions - -if [ -f /etc/default/$BASE ]; then - . /etc/default/$BASE -fi - -# Check docker is present -if [ ! -x $DOCKERD ]; then - log_failure_msg "$DOCKERD not present or not executable" - exit 1 -fi - -check_init() { - # see also init_is_upstart in /lib/lsb/init-functions (which isn't available in Ubuntu 12.04, or we'd use it directly) - if [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | grep -q upstart; then - log_failure_msg "$DOCKER_DESC is managed via upstart, try using service $BASE $1" - exit 1 - fi -} - -fail_unless_root() { - if [ "$(id -u)" != '0' ]; then - log_failure_msg "$DOCKER_DESC must be run as root" - exit 1 - fi -} - -cgroupfs_mount() { - # see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount - if grep -v '^#' /etc/fstab | grep -q cgroup \ - || [ ! -e /proc/cgroups ] \ - || [ ! -d /sys/fs/cgroup ]; then - return - fi - if ! mountpoint -q /sys/fs/cgroup; then - mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup - fi - ( - cd /sys/fs/cgroup - for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do - mkdir -p $sys - if ! mountpoint -q $sys; then - if ! mount -n -t cgroup -o $sys cgroup $sys; then - rmdir $sys || true - fi - fi - done - ) -} - -case "$1" in - start) - check_init - - fail_unless_root - - cgroupfs_mount - - touch "$DOCKER_LOGFILE" - chgrp docker "$DOCKER_LOGFILE" - - ulimit -n 1048576 - - # Having non-zero limits causes performance problems due to accounting overhead - # in the kernel. We recommend using cgroups to do container-local accounting. - if [ "$BASH" ]; then - ulimit -u unlimited - else - ulimit -p unlimited - fi - - log_begin_msg "Starting $DOCKER_DESC: $BASE" - start-stop-daemon --start --background \ - --no-close \ - --exec "$DOCKERD" \ - --pidfile "$DOCKER_SSD_PIDFILE" \ - --make-pidfile \ - -- \ - -p "$DOCKER_PIDFILE" \ - $DOCKER_OPTS \ - >> "$DOCKER_LOGFILE" 2>&1 - log_end_msg $? - ;; - - stop) - check_init - fail_unless_root - if [ -f "$DOCKER_SSD_PIDFILE" ]; then - log_begin_msg "Stopping $DOCKER_DESC: $BASE" - start-stop-daemon --stop --pidfile "$DOCKER_SSD_PIDFILE" --retry 10 - log_end_msg $? - else - log_warning_msg "Docker already stopped - file $DOCKER_SSD_PIDFILE not found." - fi - ;; - - restart) - check_init - fail_unless_root - docker_pid=`cat "$DOCKER_SSD_PIDFILE" 2>/dev/null` - [ -n "$docker_pid" ] \ - && ps -p $docker_pid > /dev/null 2>&1 \ - && $0 stop - $0 start - ;; - - force-reload) - check_init - fail_unless_root - $0 restart - ;; - - status) - check_init - status_of_proc -p "$DOCKER_SSD_PIDFILE" "$DOCKERD" "$DOCKER_DESC" - ;; - - *) - echo "Usage: service docker {start|stop|restart|status}" - exit 1 - ;; -esac diff --git a/init/docker.conf b/init/docker.conf deleted file mode 100644 index d58f7d6a..00000000 --- a/init/docker.conf +++ /dev/null @@ -1,72 +0,0 @@ -description "Docker daemon" - -start on (filesystem and net-device-up IFACE!=lo) -stop on runlevel [!2345] - -limit nofile 524288 1048576 - -# Having non-zero limits causes performance problems due to accounting overhead -# in the kernel. We recommend using cgroups to do container-local accounting. -limit nproc unlimited unlimited - -respawn - -kill timeout 20 - -pre-start script - # see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount - if grep -v '^#' /etc/fstab | grep -q cgroup \ - || [ ! -e /proc/cgroups ] \ - || [ ! -d /sys/fs/cgroup ]; then - exit 0 - fi - if ! mountpoint -q /sys/fs/cgroup; then - mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup - fi - ( - cd /sys/fs/cgroup - for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do - mkdir -p $sys - if ! mountpoint -q $sys; then - if ! mount -n -t cgroup -o $sys cgroup $sys; then - rmdir $sys || true - fi - fi - done - ) -end script - -script - # modify these in /etc/default/$UPSTART_JOB (/etc/default/docker) - DOCKERD=/usr/bin/dockerd - DOCKER_OPTS= - if [ -f /etc/default/$UPSTART_JOB ]; then - . /etc/default/$UPSTART_JOB - fi - exec "$DOCKERD" $DOCKER_OPTS --raw-logs -end script - -# Don't emit "started" event until docker.sock is ready. -# See https://github.com/docker/docker/issues/6647 -post-start script - DOCKER_OPTS= - DOCKER_SOCKET= - if [ -f /etc/default/$UPSTART_JOB ]; then - . /etc/default/$UPSTART_JOB - fi - - if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then - DOCKER_SOCKET=/var/run/docker.sock - else - DOCKER_SOCKET=$(printf "%s" "$DOCKER_OPTS" | grep -oP -e '(-H|--host)\W*unix://\K(\S+)' | sed 1q) - fi - - if [ -n "$DOCKER_SOCKET" ]; then - while ! [ -e "$DOCKER_SOCKET" ]; do - initctl status $UPSTART_JOB | grep -qE "(stop|respawn)/" && exit 1 - echo "Waiting for $DOCKER_SOCKET" - sleep 0.1 - done - echo "$DOCKER_SOCKET is up" - fi -end script diff --git a/rc0.d/K01docker b/rc0.d/K01docker deleted file mode 120000 index 567023b7..00000000 --- a/rc0.d/K01docker +++ /dev/null @@ -1 +0,0 @@ -../init.d/docker \ No newline at end of file diff --git a/rc1.d/K01docker b/rc1.d/K01docker deleted file mode 120000 index 567023b7..00000000 --- a/rc1.d/K01docker +++ /dev/null @@ -1 +0,0 @@ -../init.d/docker \ No newline at end of file diff --git a/rc2.d/S01docker b/rc2.d/S01docker deleted file mode 120000 index 567023b7..00000000 --- a/rc2.d/S01docker +++ /dev/null @@ -1 +0,0 @@ -../init.d/docker \ No newline at end of file diff --git a/rc3.d/S01docker b/rc3.d/S01docker deleted file mode 120000 index 567023b7..00000000 --- a/rc3.d/S01docker +++ /dev/null @@ -1 +0,0 @@ -../init.d/docker \ No newline at end of file diff --git a/rc4.d/S01docker b/rc4.d/S01docker deleted file mode 120000 index 567023b7..00000000 --- a/rc4.d/S01docker +++ /dev/null @@ -1 +0,0 @@ -../init.d/docker \ No newline at end of file diff --git a/rc5.d/S01docker b/rc5.d/S01docker deleted file mode 120000 index 567023b7..00000000 --- a/rc5.d/S01docker +++ /dev/null @@ -1 +0,0 @@ -../init.d/docker \ No newline at end of file diff --git a/rc6.d/K01docker b/rc6.d/K01docker deleted file mode 120000 index 567023b7..00000000 --- a/rc6.d/K01docker +++ /dev/null @@ -1 +0,0 @@ -../init.d/docker \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/docker.service b/systemd/system/multi-user.target.wants/docker.service deleted file mode 120000 index a06e3f51..00000000 --- a/systemd/system/multi-user.target.wants/docker.service +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/docker.service \ No newline at end of file diff --git a/systemd/system/sockets.target.wants/docker.socket b/systemd/system/sockets.target.wants/docker.socket deleted file mode 120000 index 6d81ae16..00000000 --- a/systemd/system/sockets.target.wants/docker.socket +++ /dev/null @@ -1 +0,0 @@ -/lib/systemd/system/docker.socket \ No newline at end of file