Skip to content

Commit b03ea17

Browse files
committed
Refactorized the rules targetting docker-*
Signed-off-by: Ariel Otilibili <otilibil@eurecom.fr>
1 parent 6910e61 commit b03ea17

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,24 +224,24 @@ docker: docker-alpine docker-ubuntu ## Generate local docker images
224224
docker-alpine: docker-alpine-full docker-alpine-minimal docker-alpine-dev ## Generate local docker images (Alpine)
225225

226226
docker-alpine-full: ## Generate local docker image (Alpine full)
227-
docker buildx build --target full -f ./docker-files/alpine.Dockerfile -t glances:local-alpine-full .
227+
$(DOCKER_BUILD) --target full -f $(DOCKERFILE_ALPINE) -t glances:local-alpine-full .
228228

229229
docker-alpine-minimal: ## Generate local docker image (Alpine minimal)
230-
docker buildx build --target minimal -f ./docker-files/alpine.Dockerfile -t glances:local-alpine-minimal .
230+
$(DOCKER_BUILD) --target minimal -f $(DOCKERFILE_ALPINE) -t glances:local-alpine-minimal .
231231

232232
docker-alpine-dev: ## Generate local docker image (Alpine dev)
233-
docker buildx build --target dev -f ./docker-files/alpine.Dockerfile -t glances:local-alpine-dev .
233+
$(DOCKER_BUILD) --target dev -f $(DOCKERFILE_ALPINE) -t glances:local-alpine-dev .
234234

235235
docker-ubuntu: docker-ubuntu-full docker-ubuntu-minimal docker-ubuntu-dev ## Generate local docker images (Ubuntu)
236236

237237
docker-ubuntu-full: ## Generate local docker image (Ubuntu full)
238-
docker buildx build --target full -f ./docker-files/ubuntu.Dockerfile -t glances:local-ubuntu-full .
238+
$(DOCKER_BUILD) --target full -f $(DOCKERFILE_UBUNTU) -t glances:local-ubuntu-full .
239239

240240
docker-ubuntu-minimal: ## Generate local docker image (Ubuntu minimal)
241-
docker buildx build --target minimal -f ./docker-files/ubuntu.Dockerfile -t glances:local-ubuntu-minimal .
241+
$(DOCKER_BUILD) --target minimal -f $(DOCKERFILE_UBUNTU) -t glances:local-ubuntu-minimal .
242242

243243
docker-ubuntu-dev: ## Generate local docker image (Ubuntu dev)
244-
docker buildx build --target dev -f ./docker-files/ubuntu.Dockerfile -t glances:local-ubuntu-dev .
244+
$(DOCKER_BUILD) --target dev -f $(DOCKERFILE_UBUNTU) -t glances:local-ubuntu-dev .
245245

246246
# ===================================================================
247247
# Run
@@ -269,22 +269,22 @@ run-min-local-conf: ## Start minimal Glances in console mode with the system con
269269
$(VENV_MIN)/python -m glances
270270

271271
run-docker-alpine-minimal: ## Start Glances Alpine Docker minimal in console mode
272-
docker run --rm -e TZ="${TZ}" -e GLANCES_OPT="" -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host --network host -it glances:local-alpine-minimal
272+
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-alpine-minimal
273273

274274
run-docker-alpine-full: ## Start Glances Alpine Docker full in console mode
275-
docker run --rm -e TZ="${TZ}" -e GLANCES_OPT="" -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host --network host -it glances:local-alpine-full
275+
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-alpine-full
276276

277277
run-docker-alpine-dev: ## Start Glances Alpine Docker dev in console mode
278-
docker run --rm -e TZ="${TZ}" -e GLANCES_OPT="" -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host --network host -it glances:local-alpine-dev
278+
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-alpine-dev
279279

280280
run-docker-ubuntu-minimal: ## Start Glances Ubuntu Docker minimal in console mode
281-
docker run --rm -e TZ="${TZ}" -e GLANCES_OPT="" -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host --network host -it glances:local-ubuntu-minimal
281+
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-ubuntu-minimal
282282

283283
run-docker-ubuntu-full: ## Start Glances Ubuntu Docker full in console mode
284-
docker run --rm -e TZ="${TZ}" -e GLANCES_OPT="" -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host --network host -it glances:local-ubuntu-full
284+
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-ubuntu-full
285285

286286
run-docker-ubuntu-dev: ## Start Glances Ubuntu Docker dev in console mode
287-
docker run --rm -e TZ="${TZ}" -e GLANCES_OPT="" -v /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro -v /var/run/docker.sock:/var/run/docker.sock:ro --pid host --network host -it glances:local-ubuntu-dev
287+
$(DOCKER_RUN) $(DOCKER_OPTS) $(DOCKER_SOCKS) -it glances:local-ubuntu-dev
288288

289289
run-webserver: ## Start Glances in Web server mode
290290
$(PYTHON) -m glances -C $(CONF) -w

0 commit comments

Comments
 (0)