Skip to content

Commit d0fcde7

Browse files
committed
Rename Docker Swarm references to Docker Container in configuration files and update image names for consistency
1 parent 102c66f commit d0fcde7

10 files changed

Lines changed: 30 additions & 30 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010

1111
env:
1212
REGISTRY: docker.io
13-
UPDATER_IMAGE_NAME: woolfg/docker-swarm-autoupdater-updater
14-
TRIGGER_IMAGE_NAME: woolfg/docker-swarm-autoupdater-trigger
13+
UPDATER_IMAGE_NAME: woolfg/docker-container-autoupdater-updater
14+
TRIGGER_IMAGE_NAME: woolfg/docker-container-autoupdater-trigger
1515

1616
jobs:
1717
build-and-publish:

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ COMPOSE = docker compose
66
VERSION ?= $(shell git describe --tags --always --dirty 2>/dev/null || echo "No tags found")
77

88
# Docker Hub settings (for reference only)
9-
UPDATER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_USER)/docker-swarm-autoupdater-updater
10-
TRIGGER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_USER)/docker-swarm-autoupdater-trigger
9+
UPDATER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_USER)/docker-container-autoupdater-updater
10+
TRIGGER_IMAGE ?= $(DOCKER_REGISTRY)/$(DOCKER_USER)/docker-container-autoupdater-trigger
1111

1212
.PHONY: help
1313
help: ## help message, list all commands

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Docker Swarm Autoupdater
1+
# Docker Container Autoupdater
22

33
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.
44

@@ -64,14 +64,14 @@ periodically.
6464

6565
**Security through separation of concerns:**
6666

67-
1. **Trigger Container** (`woolfg/docker-swarm-autoupdater-trigger`)
67+
1. **Trigger Container** (`woolfg/docker-container-autoupdater-trigger`)
6868
- Handles HTTP webhooks from external sources
6969
- Is connted to the outside world
7070
- Runs as non-root user
7171
- **No Docker socket access** - can't control containers
7272
- Only writes trigger files to shared volume
7373

74-
2. **Updater Container** (`woolfg/docker-swarm-autoupdater-updater`)
74+
2. **Updater Container** (`woolfg/docker-container-autoupdater-updater`)
7575
- Monitors for trigger files
7676
- Runs scheduled updates every 15 minutes
7777
- **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
8888
services:
8989
# Updater service - runs as root with Docker socket access (isolated)
9090
updater:
91-
image: woolfg/docker-swarm-autoupdater-updater:latest
91+
image: woolfg/docker-container-autoupdater-updater:latest
9292
volumes:
9393
- /var/run/docker.sock:/var/run/docker.sock
9494
- trigger-volume:/shared
@@ -105,7 +105,7 @@ services:
105105

106106
# Trigger service - public facing, no privileged access
107107
trigger:
108-
image: woolfg/docker-swarm-autoupdater-trigger:latest
108+
image: woolfg/docker-container-autoupdater-trigger:latest
109109
ports:
110110
- "8080:3000"
111111
volumes:
@@ -131,7 +131,7 @@ version: '3.8'
131131

132132
services:
133133
updater:
134-
image: woolfg/docker-swarm-autoupdater-updater:latest
134+
image: woolfg/docker-container-autoupdater-updater:latest
135135
volumes:
136136
- /var/run/docker.sock:/var/run/docker.sock
137137
- trigger-volume:/shared
@@ -140,7 +140,7 @@ services:
140140
restart: unless-stopped
141141

142142
trigger:
143-
image: woolfg/docker-swarm-autoupdater-trigger:latest
143+
image: woolfg/docker-container-autoupdater-trigger:latest
144144
ports:
145145
- "8080:3000"
146146
volumes:
@@ -161,7 +161,7 @@ If you only want scheduled updates without webhooks:
161161
```yaml
162162
services:
163163
updater:
164-
image: woolfg/docker-swarm-autoupdater-updater:latest
164+
image: woolfg/docker-container-autoupdater-updater:latest
165165
volumes:
166166
- /var/run/docker.sock:/var/run/docker.sock
167167
environment:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Docker Autoupdater configuration
33

44
# Docker images
5-
docker_autoupdater_updater_image: "woolfg/docker-swarm-autoupdater-updater:latest"
6-
docker_autoupdater_trigger_image: "woolfg/docker-swarm-autoupdater-trigger:latest"
5+
docker_autoupdater_updater_image: "woolfg/docker-container-autoupdater-updater:latest"
6+
docker_autoupdater_trigger_image: "woolfg/docker-container-autoupdater-trigger:latest"
77

88
# Volume configuration (only used when trigger is enabled)
99
docker_autoupdater_volume_name: "docker_autoupdater_shared_volume"

examples/docker-compose/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: '3.8'
77
services:
88
# Updater service - runs as root with Docker socket access (isolated)
99
updater:
10-
image: woolfg/docker-swarm-autoupdater-updater:latest
10+
image: woolfg/docker-container-autoupdater-updater:latest
1111
container_name: docker-autoupdater-updater
1212
volumes:
1313
- /var/run/docker.sock:/var/run/docker.sock
@@ -23,7 +23,7 @@ services:
2323

2424
# Trigger service - public facing, no privileged access
2525
trigger:
26-
image: woolfg/docker-swarm-autoupdater-trigger:latest
26+
image: woolfg/docker-container-autoupdater-trigger:latest
2727
container_name: docker-autoupdater-trigger
2828
ports:
2929
- "8080:3000"

examples/docker-compose/docker-swarm.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: '3.8'
77
services:
88
# Updater service - runs as root with Docker socket access (isolated)
99
updater:
10-
image: woolfg/docker-swarm-autoupdater-updater:latest
10+
image: woolfg/docker-container-autoupdater-updater:latest
1111
volumes:
1212
- /var/run/docker.sock:/var/run/docker.sock
1313
- trigger-volume:/shared
@@ -24,11 +24,11 @@ services:
2424
constraints:
2525
- node.role == manager # MUST run on manager node for swarm access
2626
labels:
27-
- "docker_swarm_autoupdater.enable=false" # Don't update itself
27+
- "docker_autoupdater.enable=false" # Don't update itself
2828

2929
# Trigger service - public facing, no privileged access
3030
trigger:
31-
image: woolfg/docker-swarm-autoupdater-trigger:latest
31+
image: woolfg/docker-container-autoupdater-trigger:latest
3232
ports:
3333
- target: 3000
3434
published: 8080
@@ -47,7 +47,7 @@ services:
4747
deploy:
4848
replicas: 1
4949
labels:
50-
- "docker_swarm_autoupdater.enable=false" # Don't update itself
50+
- "docker_autoupdater.enable=false" # Don't update itself
5151

5252
volumes:
5353
trigger-volume:
@@ -75,6 +75,6 @@ networks:
7575
# deploy:
7676
# replicas: 2
7777
# labels:
78-
# - "docker_swarm_autoupdater.enable=true" # Enable auto-updates
78+
# - "docker_autoupdater.enable=true" # Enable auto-updates (or docker_swarm_autoupdater.enable=true for backwards compatibility)
7979
# restart_policy:
8080
# condition: unless-stopped

examples/docker-compose/standalone-swarm.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: '3.8'
77
services:
88
# Updater service only - runs as root with Docker socket access
99
updater:
10-
image: woolfg/docker-swarm-autoupdater-updater:latest
10+
image: woolfg/docker-container-autoupdater-updater:latest
1111
volumes:
1212
- /var/run/docker.sock:/var/run/docker.sock
1313
environment:
@@ -21,7 +21,7 @@ services:
2121
constraints:
2222
- node.role == manager # MUST run on manager node for swarm access
2323
labels:
24-
- "docker_swarm_autoupdater.enable=false" # Don't update itself
24+
- "docker_autoupdater.enable=false" # Don't update itself
2525

2626
# Example of a service that will be auto-updated
2727
# Uncomment and modify as needed:
@@ -35,6 +35,6 @@ services:
3535
# deploy:
3636
# replicas: 2
3737
# labels:
38-
# - "docker_swarm_autoupdater.enable=true" # Enable auto-updates
38+
# - "docker_autoupdater.enable=true" # Enable auto-updates (or docker_swarm_autoupdater.enable=true for backwards compatibility)
3939
# restart_policy:
4040
# condition: unless-stopped

examples/docker-compose/standalone.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: '3.8'
77
services:
88
# Updater service only - runs as root with Docker socket access
99
updater:
10-
image: woolfg/docker-swarm-autoupdater-updater:latest
10+
image: woolfg/docker-container-autoupdater-updater:latest
1111
container_name: docker-autoupdater-updater
1212
volumes:
1313
- /var/run/docker.sock:/var/run/docker.sock

trigger/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "docker-swarm-autoupdater-trigger",
2+
"name": "docker-container-autoupdater-trigger",
33
"version": "1.0.0",
4-
"description": "Trigger service for Docker Swarm Autoupdater",
4+
"description": "Trigger service for Docker Container Autoupdater",
55
"main": "index.js",
66
"scripts": {
77
"start": "node index.js"
@@ -11,7 +11,7 @@
1111
},
1212
"keywords": [
1313
"docker",
14-
"swarm",
14+
"container",
1515
"autoupdater",
1616
"webhook",
1717
"trigger"

updater/update.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ docker=$(which docker)
55
platform="amd64"
66
os="linux"
77

8-
# allow docker_swarm_autoupdater docker_autoupdater
9-
filters=("label=docker_swarm_autoupdater.enable=true" "label=docker_autoupdater.enable=true")
8+
# Support both new docker_autoupdater and legacy docker_swarm_autoupdater labels for backwards compatibility
9+
filters=("label=docker_autoupdater.enable=true" "label=docker_swarm_autoupdater.enable=true")
1010

1111
echo "Starting autoupdater"
1212

0 commit comments

Comments
 (0)