diff --git a/build/Makefile b/build/Makefile index 2a4f47535b..667eb33d7d 100644 --- a/build/Makefile +++ b/build/Makefile @@ -2,6 +2,7 @@ export PACKER_CACHE_DIR := .cache export PACKER_VERSION := 1.9.4 export BOX_VERSION := 202407.23.0 export PMM_SERVER_IMAGE ?= docker.io/perconalab/pmm-server:3-dev-latest +export WATCHTOWER_IMAGE ?= docker.io/perconalab/watchtower:dev-latest export CENTOS_ISO := 2004.01 ## ----------------- PACKER ------------------ @@ -25,7 +26,10 @@ deps: unzip -o ${PACKER_CACHE_DIR}/packer.zip -d ~/bin pmm-ovf: fetch - /usr/bin/packer build -var 'pmm_server_image_name=${PMM_SERVER_IMAGE}' -only virtualbox-ovf -color=false packer/pmm.json | tee build.log + /usr/bin/packer build \ + -var 'pmm_server_image_name=${PMM_SERVER_IMAGE}' \ + -var 'watchtower_image_name=${WATCHTOWER_IMAGE}' \ + -only virtualbox-ovf -color=false packer/pmm.json | tee build.log pmm-digitalocean: packer build -only digitalocean -var 'single_disk=true' packer/pmm.json @@ -35,7 +39,9 @@ pmm-azure: pmm-ami: docker run --rm -v ${HOME}/.aws:/root/.aws -v `pwd`:/build -w /build \hashicorp/packer:${PACKER_VERSION} \ - build -var 'pmm_server_image_name=${PMM_SERVER_IMAGE}' -only amazon-ebs -color=false packer/pmm.json | tee build.log + build -var 'pmm_server_image_name=${PMM_SERVER_IMAGE}' \ + -var 'watchtower_image_name=${WATCHTOWER_IMAGE}' \ + -only amazon-ebs -color=false packer/pmm.json | tee build.log ## ----------------- PACKER ------------------ check: diff --git a/build/packer/ansible/roles/podman-setup/templates/watchtower.env b/build/packer/ansible/roles/podman-setup/templates/watchtower.env index 727aa953fe..44ad59f48a 100644 --- a/build/packer/ansible/roles/podman-setup/templates/watchtower.env +++ b/build/packer/ansible/roles/podman-setup/templates/watchtower.env @@ -1,3 +1,4 @@ +WATCHTOWER_IMAGE={{ watchtower_image_name }} WATCHTOWER_HTTP_API_UPDATE=1 WATCHTOWER_HTTP_API_TOKEN=123 WATCHTOWER_NO_RESTART=1 diff --git a/build/packer/ansible/roles/podman-setup/templates/watchtower.service b/build/packer/ansible/roles/podman-setup/templates/watchtower.service index 7fc366d86b..017167a230 100644 --- a/build/packer/ansible/roles/podman-setup/templates/watchtower.service +++ b/build/packer/ansible/roles/podman-setup/templates/watchtower.service @@ -15,7 +15,7 @@ ExecStart=/usr/bin/podman run --rm --replace=true --name %N \ --env-file=/home/admin/.config/systemd/user/watchtower.env \ --net pmm_default \ --cap-add=net_admin,net_raw \ - docker.io/perconalab/watchtower + ${WATCHTOWER_IMAGE} ExecStop=/usr/bin/podman stop -t 10 %N diff --git a/build/packer/pmm.json b/build/packer/pmm.json index 5fd2f79a43..c0c88de4ab 100644 --- a/build/packer/pmm.json +++ b/build/packer/pmm.json @@ -1,7 +1,8 @@ { "variables": { "single_disk": "false", - "pmm_server_image_name": "docker.io/perconalab/pmm-server:3-dev-latest" + "pmm_server_image_name": "docker.io/perconalab/pmm-server:3-dev-latest", + "watchtower_image_name": "docker.io/perconalab/watchtower:dev-latest" }, "builders": [ { @@ -124,7 +125,7 @@ "-vvv", "-u root", "--extra-vars", - "\"pmm_server_image_name='{{ user `pmm_server_image_name`}}'\"" + "\"pmm_server_image_name='{{ user `pmm_server_image_name` }}' watchtower_image_name='{{ user `watchtower_image_name` }}'\"" ], "role_paths": [ "packer/ansible/roles/lvm-init",