mirror of https://github.com/nicolargo/glances
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>pull/2913/head
parent
69290ee405
commit
ddfcf46dee
11
Makefile
11
Makefile
|
@ -8,9 +8,10 @@ PYTHON := $(VENV)/python
|
||||||
LASTTAG = $(shell git describe --tags --abbrev=0)
|
LASTTAG = $(shell git describe --tags --abbrev=0)
|
||||||
|
|
||||||
IMAGES_TYPES := full minimal dev
|
IMAGES_TYPES := full minimal dev
|
||||||
ALPINE_IMAGES := $(IMAGES_TYPES:%=docker-alpine-%)
|
DISTROS := alpine ubuntu
|
||||||
UBUNTU_IMAGES := $(IMAGES_TYPES:%=docker-ubuntu-%)
|
alpine_images := $(IMAGES_TYPES:%=docker-alpine-%)
|
||||||
DOCKER_IMAGES := $(ALPINE_IMAGES) $(UBUNTU_IMAGES)
|
ubuntu_images := $(IMAGES_TYPES:%=docker-ubuntu-%)
|
||||||
|
DOCKER_IMAGES := $(alpine_images) $(ubuntu_images)
|
||||||
DOCKER_RUNTIMES := $(DOCKER_IMAGES:%=run-%)
|
DOCKER_RUNTIMES := $(DOCKER_IMAGES:%=run-%)
|
||||||
UNIT_TESTS := test-core test-restful test-xmlrpc
|
UNIT_TESTS := test-core test-restful test-xmlrpc
|
||||||
DOCKER_BUILD := docker buildx build
|
DOCKER_BUILD := docker buildx build
|
||||||
|
@ -236,8 +237,8 @@ $(DOCKER_IMAGES): docker-%:
|
||||||
|
|
||||||
docker: docker-alpine docker-ubuntu ## Generate local docker images
|
docker: docker-alpine docker-ubuntu ## Generate local docker images
|
||||||
|
|
||||||
docker-alpine: $(ALPINE_IMAGES) ## Generate local docker images (Alpine)
|
docker-alpine: $(alpine_images) ## Generate local docker images (Alpine)
|
||||||
docker-ubuntu: $(UBUNTU_IMAGES) ## Generate local docker images (Ubuntu)
|
docker-ubuntu: $(ubuntu_images) ## Generate local docker images (Ubuntu)
|
||||||
|
|
||||||
docker-alpine-full: ## Generate local docker image (Alpine full)
|
docker-alpine-full: ## Generate local docker image (Alpine full)
|
||||||
docker-alpine-minimal: ## Generate local docker image (Alpine minimal)
|
docker-alpine-minimal: ## Generate local docker image (Alpine minimal)
|
||||||
|
|
Loading…
Reference in New Issue