Use latest as docker tag to be compatible with docker defaults.

Keeps the `nightly` tag for compatibility with previous versions of prind.
This commit is contained in:
Markus Küffner
2022-07-07 21:50:40 +02:00
parent 43b1f3a958
commit 64740ca5a3
5 changed files with 13 additions and 12 deletions

View File

@@ -114,17 +114,17 @@ docker compose --profile fluidd --profile klipperscreen up -d
``` ```
## Updating ## Updating
Images are built daily and tagged with nightly and the first seven chars of the commit-sha of the remote repo. Images are built daily and tagged with latest and the first seven chars of the commit-sha of the remote repo.
Example: Example:
* ``mkuf/klipper:nightly`` * ``mkuf/klipper:latest``
* ``mkuf/klipper:a33d069`` * ``mkuf/klipper:a33d069``
The ``Nightly`` Tag will point to a new Image within 24h. The ``latest`` Tag will point to a new Image within 24h.
The SHA-Tag ``a33d069`` will remain and refers to [Klipper3d/klipper:a33d069](https://github.com/Klipper3d/klipper/commit/a33d0697b6438e362f0cf9d25e1e8358d331bf53) The SHA-Tag ``a33d069`` will remain and refers to [Klipper3d/klipper:a33d069](https://github.com/Klipper3d/klipper/commit/a33d0697b6438e362f0cf9d25e1e8358d331bf53)
Updating can be handled via docker-compose. Updating can be handled via docker-compose.
docker-compose.yaml uses nightly tags for all Images contained in this Repository. docker-compose.yaml uses latest tags for all Images contained in this Repository.
Compose will download all current Images and replace them when starting the stack again. Compose will download all current Images and replace them when starting the stack again.
``` ```
docker compose pull docker compose pull

View File

@@ -1,6 +1,6 @@
services: services:
make: make:
image: mkuf/klipper:${TAG:-nightly}-mcu image: mkuf/klipper:${TAG:-latest}-mcu
tty: true tty: true
privileged: true privileged: true
entrypoint: make entrypoint: make

View File

@@ -1,6 +1,6 @@
## Ustreamer base Service ## Ustreamer base Service
x-ustreamer-svc: &ustreamer-svc x-ustreamer-svc: &ustreamer-svc
image: mkuf/ustreamer:nightly image: mkuf/ustreamer:latest
restart: unless-stopped restart: unless-stopped
command: command:
- "--host=0.0.0.0" - "--host=0.0.0.0"

View File

@@ -1,6 +1,6 @@
## Common Templates ## Common Templates
x-klipper-svc: &klipper-svc x-klipper-svc: &klipper-svc
image: mkuf/klipper:nightly image: mkuf/klipper:latest
container_name: klipper container_name: klipper
restart: unless-stopped restart: unless-stopped
logging: logging:
@@ -49,7 +49,7 @@ services:
## WebApi ## WebApi
## ##
moonraker: moonraker:
image: mkuf/moonraker:nightly image: mkuf/moonraker:latest
container_name: moonraker container_name: moonraker
restart: unless-stopped restart: unless-stopped
pid: host pid: host
@@ -121,7 +121,7 @@ services:
- "traefik.http.routers.fluidd.entrypoints=web" - "traefik.http.routers.fluidd.entrypoints=web"
mainsail: mainsail:
image: mkuf/mainsail:nightly image: mkuf/mainsail:latest
container_name: mainsail container_name: mainsail
restart: unless-stopped restart: unless-stopped
profiles: profiles:
@@ -133,7 +133,7 @@ services:
- "traefik.http.routers.mainsail.entrypoints=web" - "traefik.http.routers.mainsail.entrypoints=web"
klipperscreen: klipperscreen:
image: mkuf/klipperscreen:nightly image: mkuf/klipperscreen:latest
container_name: klipperscreen container_name: klipperscreen
restart: unless-stopped restart: unless-stopped
network_mode: host network_mode: host

View File

@@ -33,16 +33,17 @@ for target in $(grep "FROM .* as" ${dockerfile} | sed -r 's/.*FROM.*as (.*)/\1/g
tag_extra="-${target}" tag_extra="-${target}"
fi fi
## Nightly ## latest
if docker manifest inspect ${registry}${app}:${shortref}${tag_extra} > /dev/null; then if docker manifest inspect ${registry}${app}:${shortref}${tag_extra} > /dev/null; then
log "## Image ${registry}${app}:${shortref}${tag_extra} already exists, nothing to do." log "## Image ${registry}${app}:${shortref}${tag_extra} already exists, nothing to do."
else else
log "## Building nightly Image ${registry}${app}:${shortref}${tag_extra}" log "## Building latest Image ${registry}${app}:${shortref}${tag_extra}"
docker buildx build \ docker buildx build \
--build-arg VERSION=${ref} \ --build-arg VERSION=${ref} \
--platform ${platform} \ --platform ${platform} \
--tag ${registry}${app}:${shortref}${tag_extra} \ --tag ${registry}${app}:${shortref}${tag_extra} \
--tag ${registry}${app}:nightly${tag_extra} \ --tag ${registry}${app}:nightly${tag_extra} \
--tag ${registry}${app}:latest${tag_extra} \
--target ${target} \ --target ${target} \
--push \ --push \
${context} ${context}