Skip to content

[fix] Added DOCKER_TAG variable for version pinning to match intended release version #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atif09 wants to merge 14 commits into
base: master
Choose a base branch
from
+42 −30
Open

[fix] Added DOCKER_TAG variable for version pinning to match intended release version #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
89e27f0
[docker-compose] Add DOCKER_TAG variable for version pinning #554
atif09 Jan 24, 2026
a4f27a0
[docker-compose] Fix linter warnings for DOCKER_TAG #554
atif09 Jan 24, 2026
1163d9f
Merge branch 'master' into issues/554-fix-docker-tag
atif09 Jan 28, 2026
0e2f706
Merge branch 'master' into issues/554-fix-docker-tag
atif09 Jan 31, 2026
aa3db97
[fix] Changed DOCKER_TAG back to latest #554
atif09 Jan 31, 2026
064b758
[format] Changed DOCKER_TAG back to latest #554
atif09 Jan 31, 2026
9b93572
Merge branch 'master' into issues/554-fix-docker-tag
atif09 Feb 16, 2026
b6b4e6f
[fix] Add OPENWISP_VERSION variable for version pinning #554
atif09 Feb 16, 2026
23dd5bc
[fix] Use OPENWISP_VERSION in Makefile pull target #554
atif09 Feb 16, 2026
7d6f768
[fix] Address review comments #554
atif09 Feb 17, 2026
3842b37
Merge branch 'master' into issues/554-fix-docker-tag
atif09 Feb 17, 2026
7e2f422
[fix] Address review comments and nitpicks by code rabbit #554
atif09 Feb 17, 2026
d135571
[chores] Clearer comments #554
atif09 Feb 25, 2026
239a466
[fix/chores] Pinned RELEASE_VERSION in release target and clarified .…
atif09 Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
# Essential
DASHBOARD_DOMAIN=dashboard.openwisp.org
API_DOMAIN=api.openwisp.org
# Image tag pinning
IMAGE_OWNER=openwisp
# OPENWISP_VERSION: Image tag version (e.g., "25.10.0", "latest", or "edge")
OPENWISP_VERSION=edge
# SSH Credentials Configurations
SSH_PRIVATE_KEY_PATH=/home/openwisp/.ssh/id_ed25519
SSH_PUBLIC_KEY_PATH=/home/openwisp/.ssh/id_ed25519.pub
Expand Down
30 changes: 19 additions & 11 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
# Find documentation in README.md under
# the heading "Makefile Options".

OPENWISP_VERSION = 25.10.0
include .env # The .env file can override ?= variables in the Makefile (e.g. OPENWISP_VERSION, IMAGE_OWNER)

# RELEASE_VERSION: version string used when tagging a new release.
RELEASE_VERSION = 25.10.0
SHELL := /bin/bash
.SILENT: clean pull start stop

default: compose-build

USER = registry.gitlab.com/openwisp/docker-openwisp
TAG = edge
# OPENWISP_VERSION: image tag used for pulling/pushing images (e.g. "edge", "latest", "25.10.0")
# Can be overridden via .env or command line. Not the same as RELEASE_VERSION
OPENWISP_VERSION ?= edge
IMAGE_OWNER ?= openwisp
Comment on lines +17 to +18
Copy link
Member

@pandafy pandafy Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@atif09 what is the difference between USER and IMAGE_OWNER?

Copy link
Contributor Author

@atif09 atif09 Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

USER is the full gitlab registry url, it cant double as a local image namespace, IMAGE_OWNER does that and being a separate variable, lets contributors override it with their own namespace locally

SKIP_PULL ?= false
SKIP_BUILD ?= false
SKIP_TESTS ?= false
Expand All @@ -19,8 +26,8 @@ pull:
for image in 'openwisp-base' 'openwisp-nfs' 'openwisp-api' 'openwisp-dashboard' \
'openwisp-freeradius' 'openwisp-nginx' 'openwisp-openvpn' 'openwisp-postfix' \
'openwisp-websocket' ; do \
docker pull --quiet $(USER)/$${image}:$(TAG); \
docker tag $(USER)/$${image}:$(TAG) openwisp/$${image}:latest; \
docker pull --quiet $(USER)/$${image}:$(OPENWISP_VERSION); \
docker tag $(USER)/$${image}:$(OPENWISP_VERSION) $(IMAGE_OWNER)/$${image}:$(OPENWISP_VERSION); \
done

# Build
Expand All @@ -41,11 +48,13 @@ base-build:
$$BUILD_ARGS; \
docker build --tag openwisp/openwisp-base:latest \
--file ./images/openwisp_base/Dockerfile ./images/ \
$$BUILD_ARGS
$$BUILD_ARGS; \
docker tag openwisp/openwisp-base:latest $(IMAGE_OWNER)/openwisp-base:$(OPENWISP_VERSION)
Copy link
Member

@pandafy pandafy Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this change. Why is this required?

Copy link
Contributor Author

@atif09 atif09 Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

without this docker tag , the $(IMAGE_OWNER)/openwisp-base:$(OPENWISP_VERSION) never exists and publish fails

Copy link
Contributor Author

@atif09 atif09 Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because publish sources from $(IMAGE_OWNER)/$${image}:${OPENWISP_VERSION} when tagging and pushing, and base-build only produces openwisp/openwisp-basse:latest


nfs-build:
docker build --tag openwisp/openwisp-nfs:latest \
--file ./images/openwisp_nfs/Dockerfile ./images/
--file ./images/openwisp_nfs/Dockerfile ./images/; \
docker tag openwisp/openwisp-nfs:latest $(IMAGE_OWNER)/openwisp-nfs:$(OPENWISP_VERSION)

compose-build: base-build
docker compose build --parallel
Expand Down Expand Up @@ -76,6 +85,8 @@ clean:
openwisp/openwisp-base:intermedia-system \
openwisp/openwisp-base:intermedia-python \
openwisp/openwisp-nfs:latest \
$(IMAGE_OWNER)/openwisp-base:$(OPENWISP_VERSION) \
$(IMAGE_OWNER)/openwisp-nfs:$(OPENWISP_VERSION) \
`docker images -f "dangling=true" -q` \
`docker images | grep openwisp/docker-openwisp | tr -s ' ' | cut -d ' ' -f 3` &> /dev/null

Expand Down Expand Up @@ -105,16 +116,13 @@ publish:
for image in 'openwisp-base' 'openwisp-nfs' 'openwisp-api' 'openwisp-dashboard' \
'openwisp-freeradius' 'openwisp-nginx' 'openwisp-openvpn' 'openwisp-postfix' \
'openwisp-websocket' ; do \
# Docker images built locally are tagged "latest" by default. \
# This script updates the tag of each built image to a user-defined tag \
# and pushes the newly tagged image to a Docker registry under the user's namespace. \
docker tag openwisp/$${image}:latest $(USER)/$${image}:$(TAG); \
docker tag $(IMAGE_OWNER)/$${image}:$(OPENWISP_VERSION) $(USER)/$${image}:$(TAG); \
docker push $(USER)/$${image}:$(TAG); \
if [ "$(TAG)" != "latest" ]; then \
docker rmi $(USER)/$${image}:$(TAG); \
fi; \
done

release:
make publish TAG=latest SKIP_TESTS=true
make publish TAG=$(OPENWISP_VERSION) SKIP_BUILD=true SKIP_TESTS=true
make publish TAG=latest OPENWISP_VERSION=$(RELEASE_VERSION) SKIP_TESTS=true
make publish TAG=$(RELEASE_VERSION) OPENWISP_VERSION=$(RELEASE_VERSION) SKIP_BUILD=true SKIP_TESTS=true
18 changes: 9 additions & 9 deletions deploy/auto-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ apt_dependenices_setup() {
}

get_version_from_user() {
echo -ne ${GRN}"OpenWISP Version (leave blank for latest): "${NON}
read openwisp_version
if [[ -z "$openwisp_version" ]]; then
openwisp_version=$(curl -L --silent https://api.github.com/repos/openwisp/docker-openwisp/releases/latest | jq -r .tag_name)
fi
echo -ne ${GRN}"OpenWISP Version (leave blank for latest stable release): "${NON}
read openwisp_version
if [[ -z "$openwisp_version" ]]; then
openwisp_version=$(curl -L --silent https://api.github.com/repos/openwisp/docker-openwisp/releases/latest | jq -r .tag_name)
fi
Comment on lines -62 to +66
Copy link
Member

@pandafy pandafy Feb 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get rid of blank space changes?

Copy link
Contributor Author

@atif09 atif09 Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will remove them

}

setup_docker() {
Expand Down Expand Up @@ -128,7 +128,7 @@ setup_docker_openwisp() {

cd $INSTALL_PATH &>>$LOG_FILE
check_status $? "docker-openwisp download failed."
echo $openwisp_version >$INSTALL_PATH/VERSION
set_env "OPENWISP_VERSION" "$openwisp_version"

if [[ ! -f "$env_path" ]]; then
# Dashboard Domain
Expand Down Expand Up @@ -179,7 +179,7 @@ setup_docker_openwisp() {
start_step "Configuring docker-openwisp..."
report_ok
start_step "Starting images docker-openwisp (this will take a while)..."
make start TAG=$(cat $INSTALL_PATH/VERSION) -C $INSTALL_PATH/ &>>$LOG_FILE
make start -C $INSTALL_PATH/ &>>$LOG_FILE
check_status $? "Starting openwisp failed."
}

Expand All @@ -192,7 +192,7 @@ upgrade_docker_openwisp() {

cd $INSTALL_PATH &>>$LOG_FILE
check_status $? "docker-openwisp download failed."
echo $openwisp_version >$INSTALL_PATH/VERSION
set_env "OPENWISP_VERSION" "$openwisp_version"

start_step "Configuring docker-openwisp..."
for config in $(grep '=' $ENV_BACKUP | cut -f1 -d'='); do
Expand All @@ -202,7 +202,7 @@ upgrade_docker_openwisp() {
report_ok

start_step "Starting images docker-openwisp (this will take a while)..."
make start TAG=$(cat $INSTALL_PATH/VERSION) -C $INSTALL_PATH/ &>>$LOG_FILE
make start -C $INSTALL_PATH/ &>>$LOG_FILE
check_status $? "Starting openwisp failed."
}

Expand Down
20 changes: 10 additions & 10 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ x-celery-depends-on: &celery-depends-on

services:
dashboard:
image: openwisp/openwisp-dashboard:latest
image: openwisp/openwisp-dashboard:${OPENWISP_VERSION:-edge}
restart: always
build:
context: images
Expand All @@ -35,7 +35,7 @@ services:
- influxdb

api:
image: openwisp/openwisp-api:latest
image: openwisp/openwisp-api:${OPENWISP_VERSION:-edge}
restart: always
build:
context: images
Expand All @@ -55,7 +55,7 @@ services:
- dashboard

websocket:
image: openwisp/openwisp-websocket:latest
image: openwisp/openwisp-websocket:${OPENWISP_VERSION:-edge}
restart: always
build:
context: images
Expand All @@ -70,7 +70,7 @@ services:
- dashboard

celery:
image: openwisp/openwisp-dashboard:latest
image: openwisp/openwisp-dashboard:${OPENWISP_VERSION:-edge}
restart: always
environment:
- MODULE_NAME=celery
Expand All @@ -85,7 +85,7 @@ services:
network_mode: "${CELERY_SERVICE_NETWORK_MODE-service:openvpn}"

celery_monitoring:
image: openwisp/openwisp-dashboard:latest
image: openwisp/openwisp-dashboard:${OPENWISP_VERSION:-edge}
restart: always
environment:
- MODULE_NAME=celery_monitoring
Expand All @@ -99,7 +99,7 @@ services:
network_mode: "${CELERY_SERVICE_NETWORK_MODE-service:openvpn}"

celerybeat:
image: openwisp/openwisp-dashboard:latest
image: openwisp/openwisp-dashboard:${OPENWISP_VERSION:-edge}
restart: always
environment:
- MODULE_NAME=celerybeat
Expand All @@ -113,7 +113,7 @@ services:
- dashboard

nginx:
image: openwisp/openwisp-nginx:latest
image: openwisp/openwisp-nginx:${OPENWISP_VERSION:-edge}
restart: always
build:
context: images
Expand All @@ -140,7 +140,7 @@ services:
- websocket

freeradius:
image: openwisp/openwisp-freeradius:latest
image: openwisp/openwisp-freeradius:${OPENWISP_VERSION:-edge}
restart: always
build:
context: images
Expand All @@ -156,7 +156,7 @@ services:
- dashboard

postfix:
image: openwisp/openwisp-postfix:latest
image: openwisp/openwisp-postfix:${OPENWISP_VERSION:-edge}
restart: always
build:
context: images
Expand All @@ -167,7 +167,7 @@ services:
- openwisp_certs:/etc/ssl/mail

openvpn:
image: openwisp/openwisp-openvpn:latest
image: openwisp/openwisp-openvpn:${OPENWISP_VERSION:-edge}
restart: on-failure
build:
context: images
Expand Down