Merge pull request #220 from Automattic/fix-update-rc.d

fix: pass `-f` to `update-rc.d remove`
Automattic · Jun 1, 2024 · 3109c93 · 3109c93
2 parents 1b2f52e + a3b4524
commit 3109c93
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 18 deletions.
diff --git a/features/src/mariadb/devcontainer-feature.json b/features/src/mariadb/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "MariaDB",
     "id": "mariadb",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "Sets up MariaDB into the Dev Environment",
     "options": {
         "installDatabaseToWorkspaces": {

diff --git a/features/src/mariadb/install.sh b/features/src/mariadb/install.sh
@@ -47,7 +47,7 @@ case "${ID_LIKE}" in
         DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ${PACKAGES}
         apt-get clean
         rm -rf /var/lib/apt/lists/*
-        update-rc.d mariadb remove
+        update-rc.d -f mariadb remove
 
         if [ "${INSTALLDATABASETOWORKSPACES}" = 'true' ]; then
             mv /var/lib/mysql/debian-*.flag "${MARIADB_DATADIR}"

diff --git a/features/src/memcached/devcontainer-feature.json b/features/src/memcached/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
     "name": "memcached",
     "id": "memcached",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "description": "Sets up memcached into the Dev Environment",
     "options": {
         "enabled": {

diff --git a/features/src/memcached/install.sh b/features/src/memcached/install.sh
@@ -33,7 +33,7 @@ if [ "${ENABLED}" = "true" ]; then
             apt-get install -y --no-install-recommends ${PACKAGES}
             apt-get clean
             rm -rf /var/lib/apt/lists/*
-            update-rc.d memcached remove
+            update-rc.d -f memcached remove
             RUN_AS="memcache"
         ;;
 

diff --git a/features/src/php/devcontainer-feature.json b/features/src/php/devcontainer-feature.json
@@ -2,7 +2,7 @@
     "id": "php",
     "name": "PHP",
     "description": "Installs PHP into the Dev Environment",
-    "version": "2.4.2",
+    "version": "2.4.3",
     "options": {
         "version": {
             "type": "string",

diff --git a/features/src/php/install.sh b/features/src/php/install.sh
@@ -246,7 +246,7 @@ setup_php81_deb() {
     # shellcheck disable=SC2086
     eatmydata apt-get remove --purge -y ${PACKAGES}
 
-    update-rc.d php8.1-fpm remove
+    update-rc.d -f php8.1-fpm remove
 }
 
 setup_php82_deb() {
@@ -275,7 +275,7 @@ setup_php82_deb() {
     # shellcheck disable=SC2086
     eatmydata apt-get remove --purge -y ${PACKAGES}
 
-    update-rc.d php8.2-fpm remove
+    update-rc.d -f php8.2-fpm remove
 }
 
 setup_php83_deb() {
@@ -304,7 +304,7 @@ setup_php83_deb() {
     # shellcheck disable=SC2086
     eatmydata apt-get remove --purge -y ${PACKAGES}
 
-    update-rc.d php8.3-fpm remove
+    update-rc.d -f php8.3-fpm remove
 }
 
 if [ "$(id -u || true)" -ne 0 ]; then

diff --git a/features/src/ssh/devcontainer-feature.json b/features/src/ssh/devcontainer-feature.json
@@ -2,7 +2,7 @@
     "id": "ssh",
     "name": "SSH",
     "description": "Sets up SSH into the Dev Environment",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "options": {
         "enabled": {
             "type": "boolean",

diff --git a/features/src/ssh/install.sh b/features/src/ssh/install.sh
@@ -27,7 +27,7 @@ if [ "${ENABLED:-}" = "true" ]; then
             apt-get install -y --no-install-recommends openssh-server
             apt-get clean
             rm -rf /var/lib/apt/lists/*
-            update-rc.d ssh remove
+            update-rc.d -f ssh remove
             PRIVSEP_DIR=/run/sshd
         ;;
 

diff --git a/images/src/ubuntu-base/.devcontainer.json b/images/src/ubuntu-base/.devcontainer.json
@@ -6,7 +6,7 @@
     "x-build": {
         "name": "Ubuntu",
         "image-name": "ubuntu-base",
-        "image-version": "0.0.9"
+        "image-version": "0.0.10"
     },
     "remoteUser": "vscode",
     "containerEnv": {

diff --git a/images/src/ubuntu-base/.devcontainer/local-features/cleanup/devcontainer-feature.json b/images/src/ubuntu-base/.devcontainer/local-features/cleanup/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "cleanup",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "name": "Remove unnecessary files",
     "installsAfter": [
         "ghcr.io/devcontainers/features/common-utils"

diff --git a/images/src/ubuntu-base/.devcontainer/local-features/cleanup/install.sh b/images/src/ubuntu-base/.devcontainer/local-features/cleanup/install.sh
@@ -7,5 +7,5 @@ if [ "$(id -u || true)" -ne 0 ]; then
     exit 1
 fi
 
-update-rc.d dbus remove
-update-rc.d rsync remove
+update-rc.d -f dbus remove
+update-rc.d -f rsync remove
diff --git a/images/src/ubuntu-base/.devcontainer/local-features/syslog/devcontainer-feature.json b/images/src/ubuntu-base/.devcontainer/local-features/syslog/devcontainer-feature.json
@@ -2,5 +2,5 @@
     "id": "syslog",
     "name": "Syslog",
     "description": "Installs the syslog service from busybox",
-    "version": "1.0.1"
+    "version": "1.0.2"
 }
diff --git a/images/src/ubuntu-base/.devcontainer/local-features/syslog/install.sh b/images/src/ubuntu-base/.devcontainer/local-features/syslog/install.sh
@@ -5,8 +5,8 @@ apt-get install -y --no-install-recommends busybox-static busybox-syslogd
 apt-get clean
 rm -rf /var/lib/apt/lists/*
 
-update-rc.d busybox-klogd remove
-update-rc.d busybox-syslogd remove
+update-rc.d -f busybox-klogd remove
+update-rc.d -f busybox-syslogd remove
 
 install -D -m 0755 -o root -g root service-run /etc/sv/syslog/run
 install -d -m 0755 -o root -g root /etc/service

diff --git a/images/src/ubuntu-base/Dockerfile b/images/src/ubuntu-base/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN \
-    update-rc.d procps remove && \
+    update-rc.d -f procps remove && \
     touch /etc/runit/no.emulate.sysv
 
 ENTRYPOINT ["/lib/runit/runit-init"]