Rename Docker Swarm references to Docker Container in configuration files and update image names for consistency

Author: woolfg

.github/workflows/build-and-publish.yml

@@ -10,8 +10,8 @@ on:
 
 env:
   REGISTRY: docker.io
-  UPDATER_IMAGE_NAME: woolfg/docker-swarm-autoupdater-updater
-  TRIGGER_IMAGE_NAME: woolfg/docker-swarm-autoupdater-trigger
+  UPDATER_IMAGE_NAME: woolfg/docker-container-autoupdater-updater
+  TRIGGER_IMAGE_NAME: woolfg/docker-container-autoupdater-trigger
 
 jobs:
   build-and-publish:

Makefile

@@ -6,8 +6,8 @@ COMPOSE = docker compose
 VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "No tags found")
 
 # Docker Hub settings (for reference only)
-UPDATER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_USER)/docker-swarm-autoupdater-updater
-TRIGGER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_USER)/docker-swarm-autoupdater-trigger
+UPDATER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_USER)/docker-container-autoupdater-updater
+TRIGGER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_USER)/docker-container-autoupdater-trigger
 
 .PHONY: help
 help: ## help message, list all commands

README.md

@@ -1,4 +1,4 @@
-# Docker Swarm Autoupdater
+# Docker Container Autoupdater
 
 solution for automatically updating Docker Swarm services and Docker Compose containers when new images are available. It can be done periodically or triggered by a webhook.
 
@@ -64,14 +64,14 @@ periodically.
 
 **Security through separation of concerns:**
 
-1. **Trigger Container** (`woolfg/docker-swarm-autoupdater-trigger`)
+1. **Trigger Container** (`woolfg/docker-container-autoupdater-trigger`)
    - Handles HTTP webhooks from external sources
    - Is connted to the outside world
    - Runs as non-root user
    - **No Docker socket access** - can't control containers
    - Only writes trigger files to shared volume
 
-2. **Updater Container** (`woolfg/docker-swarm-autoupdater-updater`)
+2. **Updater Container** (`woolfg/docker-container-autoupdater-updater`)
    - Monitors for trigger files
    - Runs scheduled updates every 15 minutes
    - **No network access** - can't be reached from outside
@@ -88,7 +88,7 @@ In case you do not need webhooks, you can run the updater service as a standalon
 services:
   # Updater service - runs as root with Docker socket access (isolated)
   updater:
-    image: woolfg/docker-swarm-autoupdater-updater:latest
+    image: woolfg/docker-container-autoupdater-updater:latest
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - trigger-volume:/shared
@@ -105,7 +105,7 @@ services:
 
   # Trigger service - public facing, no privileged access
   trigger:
-    image: woolfg/docker-swarm-autoupdater-trigger:latest
+    image: woolfg/docker-container-autoupdater-trigger:latest
     ports:
       - "8080:3000"
     volumes:
@@ -131,7 +131,7 @@ version: '3.8'
 
 services:
   updater:
-    image: woolfg/docker-swarm-autoupdater-updater:latest
+    image: woolfg/docker-container-autoupdater-updater:latest
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - trigger-volume:/shared
@@ -140,7 +140,7 @@ services:
     restart: unless-stopped
 
   trigger:
-    image: woolfg/docker-swarm-autoupdater-trigger:latest
+    image: woolfg/docker-container-autoupdater-trigger:latest
     ports:
       - "8080:3000"
     volumes:
@@ -161,7 +161,7 @@ If you only want scheduled updates without webhooks:
 ```yaml
 services:
   updater:
-    image: woolfg/docker-swarm-autoupdater-updater:latest
+    image: woolfg/docker-container-autoupdater-updater:latest
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:

examples/ansible/docker-autoupdater/defaults/main.yml

@@ -2,8 +2,8 @@
 # Docker Autoupdater configuration
 
 # Docker images
-docker_autoupdater_updater_image: "woolfg/docker-swarm-autoupdater-updater:latest"
-docker_autoupdater_trigger_image: "woolfg/docker-swarm-autoupdater-trigger:latest"
+docker_autoupdater_updater_image: "woolfg/docker-container-autoupdater-updater:latest"
+docker_autoupdater_trigger_image: "woolfg/docker-container-autoupdater-trigger:latest"
 
 # Volume configuration (only used when trigger is enabled)
 docker_autoupdater_volume_name: "docker_autoupdater_shared_volume"

examples/docker-compose/docker-compose.yml

@@ -7,7 +7,7 @@ version: '3.8'
 services:
   # Updater service - runs as root with Docker socket access (isolated)
   updater:
-    image: woolfg/docker-swarm-autoupdater-updater:latest
+    image: woolfg/docker-container-autoupdater-updater:latest
     container_name: docker-autoupdater-updater
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
@@ -23,7 +23,7 @@ services:
 
   # Trigger service - public facing, no privileged access
   trigger:
-    image: woolfg/docker-swarm-autoupdater-trigger:latest
+    image: woolfg/docker-container-autoupdater-trigger:latest
     container_name: docker-autoupdater-trigger
     ports:
       - "8080:3000"

examples/docker-compose/docker-swarm.yml

@@ -7,7 +7,7 @@ version: '3.8'
 services:
   # Updater service - runs as root with Docker socket access (isolated)
   updater:
-    image: woolfg/docker-swarm-autoupdater-updater:latest
+    image: woolfg/docker-container-autoupdater-updater:latest
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - trigger-volume:/shared
@@ -24,11 +24,11 @@ services:
         constraints:
           - node.role == manager  # MUST run on manager node for swarm access
       labels:
-        - "docker_swarm_autoupdater.enable=false"  # Don't update itself
+        - "docker_autoupdater.enable=false"  # Don't update itself
 
   # Trigger service - public facing, no privileged access
   trigger:
-    image: woolfg/docker-swarm-autoupdater-trigger:latest
+    image: woolfg/docker-container-autoupdater-trigger:latest
     ports:
       - target: 3000
         published: 8080
@@ -47,7 +47,7 @@ services:
     deploy:
       replicas: 1
       labels:
-        - "docker_swarm_autoupdater.enable=false"  # Don't update itself
+        - "docker_autoupdater.enable=false"  # Don't update itself
 
 volumes:
   trigger-volume:
@@ -75,6 +75,6 @@ networks:
 #    deploy:
 #      replicas: 2
 #      labels:
-#        - "docker_swarm_autoupdater.enable=true"  # Enable auto-updates
+#        - "docker_autoupdater.enable=true"  # Enable auto-updates (or docker_swarm_autoupdater.enable=true for backwards compatibility)
 #      restart_policy:
 #        condition: unless-stopped

examples/docker-compose/standalone-swarm.yml

@@ -7,7 +7,7 @@ version: '3.8'
 services:
   # Updater service only - runs as root with Docker socket access
   updater:
-    image: woolfg/docker-swarm-autoupdater-updater:latest
+    image: woolfg/docker-container-autoupdater-updater:latest
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
@@ -21,7 +21,7 @@ services:
         constraints:
           - node.role == manager  # MUST run on manager node for swarm access
       labels:
-        - "docker_swarm_autoupdater.enable=false"  # Don't update itself
+        - "docker_autoupdater.enable=false"  # Don't update itself
 
 # Example of a service that will be auto-updated
 # Uncomment and modify as needed:
@@ -35,6 +35,6 @@ services:
 #    deploy:
 #      replicas: 2
 #      labels:
-#        - "docker_swarm_autoupdater.enable=true"  # Enable auto-updates
+#        - "docker_autoupdater.enable=true"  # Enable auto-updates (or docker_swarm_autoupdater.enable=true for backwards compatibility)
 #      restart_policy:
 #        condition: unless-stopped

examples/docker-compose/standalone.yml

@@ -7,7 +7,7 @@ version: '3.8'
 services:
   # Updater service only - runs as root with Docker socket access
   updater:
-    image: woolfg/docker-swarm-autoupdater-updater:latest
+    image: woolfg/docker-container-autoupdater-updater:latest
     container_name: docker-autoupdater-updater
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock

trigger/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "docker-swarm-autoupdater-trigger",
+  "name": "docker-container-autoupdater-trigger",
   "version": "1.0.0",
-  "description": "Trigger service for Docker Swarm Autoupdater",
+  "description": "Trigger service for Docker Container Autoupdater",
   "main": "index.js",
   "scripts": {
     "start": "node index.js"
@@ -11,7 +11,7 @@
   },
   "keywords": [
     "docker",
-    "swarm",
+    "container",
     "autoupdater",
     "webhook",
     "trigger"

updater/update.sh

@@ -5,8 +5,8 @@ docker=$(which docker)
 platform="amd64"
 os="linux"
 
-# allow docker_swarm_autoupdater docker_autoupdater
-filters=("label=docker_swarm_autoupdater.enable=true" "label=docker_autoupdater.enable=true")
+# Support both new docker_autoupdater and legacy docker_swarm_autoupdater labels for backwards compatibility
+filters=("label=docker_autoupdater.enable=true" "label=docker_swarm_autoupdater.enable=true")
 
 echo "Starting autoupdater"