chore: remove systemd reverse dependency by dropping software-properties-common
Through some random machinations, software-properties-common now has a dependency on systemd. This breaks the built docker image as plugins will think systemd is available, so `dokku plugin:install --core` will reference that over sv. Since we don't manage ppas in Dokku anymore - the only use was for an nginx ppa so we could use a newer Nginx - this can be safely removed. Also remove some other stuff related to systemd that aren't required anymore.
This commit is contained in:
1 parent
2bc79032cf
commit
5148600ea0
4 files changed
+1
-4
No files matched your search
@@ -59,7 +59,6 @@ RUN \
|
|||||||
&& ln -sf /mnt/dokku/var/lib/dokku/data /var/lib/dokku/data \
|
&& ln -sf /mnt/dokku/var/lib/dokku/data /var/lib/dokku/data \
|
||||||
&& ln -sf /mnt/dokku/var/lib/dokku/services /var/lib/dokku/services \
|
&& ln -sf /mnt/dokku/var/lib/dokku/services /var/lib/dokku/services \
|
||||||
&& mv /etc/my_init.d/00_regen_ssh_host_keys.sh /etc/my_init.d/15_regen_ssh_host_keys \
|
&& mv /etc/my_init.d/00_regen_ssh_host_keys.sh /etc/my_init.d/15_regen_ssh_host_keys \
|
||||||
&& rm -f /usr/bin/systemctl \
|
|
||||||
&& rm -f /etc/nginx/sites-enabled/default /usr/share/nginx/html/index.html /etc/my_init.d/10_syslog-ng.init \
|
&& rm -f /etc/nginx/sites-enabled/default /usr/share/nginx/html/index.html /etc/my_init.d/10_syslog-ng.init \
|
||||||
&& rm -f /usr/local/openresty/nginx/conf/sites-enabled/default /usr/share/openresty/html/index.html \
|
&& rm -f /usr/local/openresty/nginx/conf/sites-enabled/default /usr/share/openresty/html/index.html \
|
||||||
&& sed -i '/imklog/d' /etc/rsyslog.conf \
|
&& sed -i '/imklog/d' /etc/rsyslog.conf \
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ pkgs=(apt-transport-https
|
|||||||
curl
|
curl
|
||||||
jq
|
jq
|
||||||
linux-image-extra-virtual
|
linux-image-extra-virtual
|
||||||
software-properties-common
|
|
||||||
)
|
)
|
||||||
|
|
||||||
echo '--> Updating apt repositories'
|
echo '--> Updating apt repositories'
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ pkgs=(apache2-utils
|
|||||||
netcat
|
netcat
|
||||||
net-tools
|
net-tools
|
||||||
|
|
||||||
software-properties-common
|
|
||||||
parallel
|
parallel
|
||||||
python3-software-properties
|
python3-software-properties
|
||||||
rsync
|
rsync
|
||||||
|
|||||||
Vendored
+1
-1
@@ -3,7 +3,7 @@ Version: 0.33.7
|
|||||||
Section: web
|
Section: web
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Architecture: amd64
|
Architecture: amd64
|
||||||
Depends: apache2-utils, locales, git, cpio, curl, man-db, netcat, sshcommand, docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-compose-plugin | moby-compose, docker-buildx-plugin | moby-buildx, docker-container-healthchecker, docker-image-labeler, lambda-builder, net-tools, netrc, software-properties-common, parallel, procfile-util, python-software-properties | python3-software-properties, rsync, rsyslog, dos2unix, jq, unzip, util-linux
|
Depends: apache2-utils, locales, git, cpio, curl, man-db, netcat, sshcommand, docker-engine-cs (>= 17.05.0) | docker-engine (>= 17.05.0) | docker-io (>= 17.05.0) | docker.io (>= 17.05.0) | docker-ce (>= 17.05.0) | docker-ee (>= 17.05.0) | moby-engine, docker-compose-plugin | moby-compose, docker-buildx-plugin | moby-buildx, docker-container-healthchecker, docker-image-labeler, lambda-builder, net-tools, netrc, parallel, procfile-util, rsync, rsyslog, dos2unix, jq, unzip, util-linux
|
||||||
Recommends: herokuish, bash-completion, dokku-update, dokku-event-listener
|
Recommends: herokuish, bash-completion, dokku-update, dokku-event-listener
|
||||||
Pre-Depends: gliderlabs-sigil, nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn, sudo, python3, debconf
|
Pre-Depends: gliderlabs-sigil, nginx (>= 1.8.0) | openresty, dnsutils, cgroupfs-mount | cgroup-lite, plugn, sudo, python3, debconf
|
||||||
Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
|
Maintainer: Jose Diaz-Gonzalez <dokku@josediazgonzalez.com>
|
||||||
|
|||||||
Reference in new issue
Block a user