Skip to content

Commit ddfcf46

Browse files
committed
Renamed variables in Makefile; introduced the variable DISTROS
* needed for subsequent changes in `Makefile` * `s/ALPINE_IMAGES/alpine_images/; s/UBUNTU_IMAGES/ubuntu_images/` Signed-off-by: Ariel Otilibili <otilibil@eurecom.fr>
1 parent 69290ee commit ddfcf46

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@ PYTHON := $(VENV)/python
88
LASTTAG = $(shell git describe --tags --abbrev=0)
99

1010
IMAGES_TYPES := full minimal dev
11-
ALPINE_IMAGES := $(IMAGES_TYPES:%=docker-alpine-%)
12-
UBUNTU_IMAGES := $(IMAGES_TYPES:%=docker-ubuntu-%)
13-
DOCKER_IMAGES := $(ALPINE_IMAGES) $(UBUNTU_IMAGES)
11+
DISTROS := alpine ubuntu
12+
alpine_images := $(IMAGES_TYPES:%=docker-alpine-%)
13+
ubuntu_images := $(IMAGES_TYPES:%=docker-ubuntu-%)
14+
DOCKER_IMAGES := $(alpine_images) $(ubuntu_images)
1415
DOCKER_RUNTIMES := $(DOCKER_IMAGES:%=run-%)
1516
UNIT_TESTS := test-core test-restful test-xmlrpc
1617
DOCKER_BUILD := docker buildx build
@@ -236,8 +237,8 @@ $(DOCKER_IMAGES): docker-%:
236237

237238
docker: docker-alpine docker-ubuntu ## Generate local docker images
238239

239-
docker-alpine: $(ALPINE_IMAGES) ## Generate local docker images (Alpine)
240-
docker-ubuntu: $(UBUNTU_IMAGES) ## Generate local docker images (Ubuntu)
240+
docker-alpine: $(alpine_images) ## Generate local docker images (Alpine)
241+
docker-ubuntu: $(ubuntu_images) ## Generate local docker images (Ubuntu)
241242

242243
docker-alpine-full: ## Generate local docker image (Alpine full)
243244
docker-alpine-minimal: ## Generate local docker image (Alpine minimal)

0 commit comments

Comments
 (0)