@@ -224,24 +224,24 @@ docker: docker-alpine docker-ubuntu ## Generate local docker images
224
224
docker-alpine : docker-alpine-full docker-alpine-minimal docker-alpine-dev # # Generate local docker images (Alpine)
225
225
226
226
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 .
228
228
229
229
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 .
231
231
232
232
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 .
234
234
235
235
docker-ubuntu : docker-ubuntu-full docker-ubuntu-minimal docker-ubuntu-dev # # Generate local docker images (Ubuntu)
236
236
237
237
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 .
239
239
240
240
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 .
242
242
243
243
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 .
245
245
246
246
# ===================================================================
247
247
# Run
@@ -269,22 +269,22 @@ run-min-local-conf: ## Start minimal Glances in console mode with the system con
269
269
$(VENV_MIN ) /python -m glances
270
270
271
271
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
273
273
274
274
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
276
276
277
277
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
279
279
280
280
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
282
282
283
283
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
285
285
286
286
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
288
288
289
289
run-webserver : # # Start Glances in Web server mode
290
290
$(PYTHON ) -m glances -C $(CONF ) -w
0 commit comments