Skip to content

Commit 9a965db

Browse files
authored
chore: replace busybox with ddev/ddev-utilities, for ddev/ddev#7500 (#86)
1 parent 12c1b2a commit 9a965db

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

.github/scripts/update-checker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ check_docker_compose_yaml() {
125125
while IFS= read -r -d '' file; do
126126
if [[ -f "$file" && -r "$file" ]]; then
127127
if grep -q "build:" "$file" && ! grep -q "image:" "$file"; then
128-
actions+=("$file contains 'build:', but there is no 'image:', example: 'image: \${ADDON_TEMPLATE_DOCKER_IMAGE:-busybox:stable}-\${DDEV_SITENAME}-built', this is required to use DDEV offline")
128+
actions+=("$file contains 'build:', but there is no 'image:', example: 'image: \${ADDON_TEMPLATE_DOCKER_IMAGE:-ddev/ddev-utilities:latest}-\${DDEV_SITENAME}-built', this is required to use DDEV offline")
129129
elif grep -q "build:" "$file" && grep -q "image:" "$file" && ! grep -Eq "image:.*-\\\$\{DDEV_SITENAME\}-built" "$file"; then
130-
actions+=("$file contains both 'build:' and 'image:', but 'image:' line should contain '-\${DDEV_SITENAME}-built', example: 'image: \${ADDON_TEMPLATE_DOCKER_IMAGE:-busybox:stable}-\${DDEV_SITENAME}-built', this is required to use DDEV offline")
130+
actions+=("$file contains both 'build:' and 'image:', but 'image:' line should contain '-\${DDEV_SITENAME}-built', example: 'image: \${ADDON_TEMPLATE_DOCKER_IMAGE:-ddev/ddev-utilities:latest}-\${DDEV_SITENAME}-built', this is required to use DDEV offline")
131131
fi
132132
fi
133133
done < <(find . -name "docker-compose.*.yaml" -print0 2>/dev/null || true)

README_ADDON.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ After installation, make sure to commit the `.ddev` directory to version control
3030
To change the Docker image:
3131

3232
```bash
33-
ddev dotenv set .ddev/.env.addon-template --addon-template-docker-image="busybox:stable"
33+
ddev dotenv set .ddev/.env.addon-template --addon-template-docker-image="ddev/ddev-utilities:latest"
3434
ddev add-on get ddev/ddev-addon-template
3535
ddev restart
3636
```
@@ -41,7 +41,7 @@ All customization options (use with caution):
4141

4242
| Variable | Flag | Default |
4343
| -------- | ---- | ------- |
44-
| `ADDON_TEMPLATE_DOCKER_IMAGE` | `--addon-template-docker-image` | `busybox:stable` |
44+
| `ADDON_TEMPLATE_DOCKER_IMAGE` | `--addon-template-docker-image` | `ddev/ddev-utilities:latest` |
4545

4646
## Credits
4747

docker-compose.addon-template.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#ddev-generated
2-
# Simple template to demonstrate addon-template
32
services:
43
addon-template:
54
container_name: ddev-${DDEV_SITENAME}-addon-template
6-
image: ${ADDON_TEMPLATE_DOCKER_IMAGE:-busybox:stable}
5+
image: ${ADDON_TEMPLATE_DOCKER_IMAGE:-ddev/ddev-utilities:latest}
76
command: tail -f /dev/null
87
restart: "no"
98
# These labels ensure this service is discoverable by DDEV.

0 commit comments

Comments
 (0)