File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -8,9 +8,10 @@ PYTHON := $(VENV)/python
8
8
LASTTAG = $(shell git describe --tags --abbrev=0)
9
9
10
10
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 )
14
15
DOCKER_RUNTIMES := $(DOCKER_IMAGES:%=run-% )
15
16
UNIT_TESTS := test-core test-restful test-xmlrpc
16
17
DOCKER_BUILD := docker buildx build
@@ -236,8 +237,8 @@ $(DOCKER_IMAGES): docker-%:
236
237
237
238
docker : docker-alpine docker-ubuntu # # Generate local docker images
238
239
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)
241
242
242
243
docker-alpine-full : # # Generate local docker image (Alpine full)
243
244
docker-alpine-minimal : # # Generate local docker image (Alpine minimal)
You can’t perform that action at this time.
0 commit comments