Use long options in code

Author: mathbunnyru

.github/actions/load-image/action.yml

@@ -22,7 +22,7 @@ runs:
     - name: Load downloaded image to docker 📥
       run: |
         docker load --input /tmp/${{ inputs.image }}-${{ inputs.platform }}.tar
-        docker image ls -a
+        docker image ls --all
       shell: bash
     - name: Delete the file 🗑️
       run: rm -f /tmp/${{ inputs.image }}-${{ inputs.platform }}.tar

.github/workflows/docker-build-test-upload.yml

@@ -41,8 +41,8 @@ jobs:
       - name: Reset docker state and cleanup artifacts 🗑️
         if: ${{ inputs.platform != 'x86_64' }}
         run: |
-          docker kill $(docker ps -q) || true
-          docker rm $(docker ps -a -q) || true
+          docker kill $(docker ps --quiet) || true
+          docker rm $(docker ps --all --quiet) || true
           docker system prune --all --force
           rm -rf /tmp/tags/
           rm -rf /tmp/hist_lines/

Makefile

@@ -36,7 +36,7 @@ help:
 
 build/%: DOCKER_BUILD_ARGS?=
 build/%: ## build the latest image for a stack using the system's architecture
-	docker build $(DOCKER_BUILD_ARGS) --rm --force-rm -t $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER)
+	docker build $(DOCKER_BUILD_ARGS) --rm --force-rm --tag $(OWNER)/$(notdir $@):latest ./$(notdir $@) --build-arg OWNER=$(OWNER)
 	@echo -n "Built image size: "
 	@docker images $(OWNER)/$(notdir $@):latest --format "{{.Size}}"
 build-all: $(foreach I, $(ALL_IMAGES), build/$(I)) ## build all stacks
@@ -51,10 +51,10 @@ check-outdated-all: $(foreach I, $(ALL_IMAGES), check-outdated/$(I)) ## check al
 cont-clean-all: cont-stop-all cont-rm-all ## clean all containers (stop + rm)
 cont-stop-all: ## stop all containers
 	@echo "Stopping all containers ..."
-	-docker stop -t0 $(shell docker ps -a -q) 2> /dev/null
+	-docker stop --time 0 $(shell docker ps --all --quiet) 2> /dev/null
 cont-rm-all: ## remove all containers
 	@echo "Removing all containers ..."
-	-docker rm --force $(shell docker ps -a -q) 2> /dev/null
+	-docker rm --force $(shell docker ps --all --quiet) 2> /dev/null
 
 
 
@@ -82,7 +82,7 @@ img-rm: ## remove jupyter images
 	-docker rmi --force $(shell docker images --quiet "$(OWNER)/*") 2> /dev/null
 img-rm-dang: ## remove dangling images (tagged None)
 	@echo "Removing dangling images ..."
-	-docker rmi --force $(shell docker images -f "dangling=true" -q) 2> /dev/null
+	-docker rmi --force $(shell docker images -f "dangling=true" --quiet) 2> /dev/null
 
 
 

docs/using/recipes.md

@@ -132,7 +132,7 @@ ENTRYPOINT ["jupyter", "lab", "--ip=0.0.0.0", "--allow-root"]
 And build the image as:
 
 ```bash
-docker build -t jupyter/scipy-dasklabextension:latest .
+docker build --tag jupyter/scipy-dasklabextension:latest .
 ```
 
 Once built, run using the command:

docs/using/running.md

@@ -37,12 +37,12 @@ Pressing `Ctrl-C` twice shuts down the notebook server but leaves the container
 
 ```bash
 # list containers
-docker ps -a
+docker ps --all
 # CONTAINER ID   IMAGE                                                 COMMAND                  CREATED          STATUS                     PORTS     NAMES
 # 221331c047c4   jupyter/scipy-notebook:2023-06-01                   "tini -g -- start-no…"   11 seconds ago   Exited (0) 8 seconds ago             cranky_benz
 
 # start the stopped container
-docker start -a 221331c047c4
+docker start --attach 221331c047c4
 # Entered start.sh with args: jupyter lab
 # ...
 
@@ -71,12 +71,12 @@ This command pulls the `jupyter/all-spark-notebook` image currently tagged `late
 It then starts a container named `notebook` running a JupyterLab server and exposes the server on a randomly selected port.
 
 ```bash
-docker run -d -P --name notebook jupyter/all-spark-notebook
+docker run --detach -P --name notebook jupyter/all-spark-notebook
 ```
 
 where:
 
-- `-d`: will run the container in detached mode
+- `--detach`: will run the container in detached mode
 
 You can also use the following docker commands to see the port and notebook server token:
 

docs/using/specifics.md

@@ -14,7 +14,7 @@ This page provides details about features specific to one or more images.
   Every new spark context that is created is put onto an incrementing port (i.e. 4040, 4041, 4042, etc.), and it might be necessary to open multiple ports.
   ```
 
-  For example: `docker run -d -p 8888:8888 -p 4040:4040 -p 4041:4041 jupyter/pyspark-notebook`.
+  For example: `docker run --detach -p 8888:8888 -p 4040:4040 -p 4041:4041 jupyter/pyspark-notebook`.
 
 #### IPython low-level output capture and forward
 

docs/using/troubleshooting.md

@@ -42,7 +42,7 @@ The following sections cover a few of these scenarios and how to fix them.
 
    ```bash
    # running in detached mode - can also be run in interactive mode
-   docker run -d \
+   docker run --detach \
        -v <my-vol>:<container-dir> \
        -p 8888:8888 \
        --user root \

examples/make-deploy/Makefile

@@ -8,8 +8,8 @@ IMAGE:=my-notebook
 # Common, extensible docker run command
 define RUN_NOTEBOOK
 @docker volume create --name $(WORK_VOLUME) > /dev/null
--@docker rm -f $(NAME) 2> /dev/null
-@docker run -d -p $(PORT):8888 \
+-@docker rm --force $(NAME) 2> /dev/null
+@docker run --detach -p $(PORT):8888 \
 	--name $(NAME) \
 	-v $(WORK_VOLUME):/home/jovyan/work \
 	$(DOCKER_ARGS) \
@@ -27,7 +27,7 @@ check:
 
 image: DOCKER_ARGS?=
 image:
-	@docker build --rm $(DOCKER_ARGS) -t $(IMAGE) .
+	@docker build --rm $(DOCKER_ARGS) --tag $(IMAGE) .
 
 notebook: PORT?=80
 notebook: NAME?=notebook

examples/make-deploy/letsencrypt.makefile

@@ -30,7 +30,7 @@ letsencrypt:
 		--agree-tos \
 		--domain '$(FQDN)' \
 		--email '$(EMAIL)'; \
-		docker rm -f $(TMP_CONTAINER) > /dev/null
+		docker rm --force $(TMP_CONTAINER) > /dev/null
 # The letsencrypt image has an entrypoint, so we use the notebook image
 # instead so we can run arbitrary commands.
 # Here we set the permissions so nobody can read the cert and key.
@@ -42,7 +42,7 @@ letsencrypt:
 		$(NOTEBOOK_IMAGE) \
 		bash -c "ln -s /etc/letsencrypt/live/$(FQDN)/* /etc/letsencrypt/ && \
 			find /etc/letsencrypt -type d -exec chmod 755 {} +"; \
-			docker rm -f $(TMP_CONTAINER) > /dev/null
+			docker rm --force $(TMP_CONTAINER) > /dev/null
 
 letsencrypt-notebook: PORT?=443
 letsencrypt-notebook: NAME?=notebook