feat: Update latest images tags to 3.0.0 (#230)

* feat: Update latest images tags to 3.0.0 Update docker-compose examples to use image tags 3.0.0 instead of latest Closes: #228 * fix: update docker-compose command to v2 docker compose in document and makefile Signed-off-by: Jim Wang <[email protected]> --------- Signed-off-by: Jim Wang <[email protected]>
edgexfoundry · Jun 5, 2023 · d2ab50b · d2ab50b
1 parent 04d6a19
commit d2ab50b
Show file tree

Hide file tree

Showing 19 changed files with 1,279 additions and 2,143 deletions.
diff --git a/application-services/configurable/app-service-configurable-ibm/README.md b/application-services/configurable/app-service-configurable-ibm/README.md
@@ -89,13 +89,13 @@ EdgeX provides an [App-Service-Configurable](https://github.com/edgexfoundry/app
 * Note the volume mount of the `ibm-mqtt-export` profile at the bottom of the above snippet.
 * Start the EdgeX services including your new `app-ibm-mqtt-export` Application Service
     ```bash
-    docker-compose -p edgex up -d
+    docker compose -p edgex up -d
     ```
 
 - View the running containers.
 
   ```bash
-  docker-compose -p edgex ps
+  docker compose -p edgex ps
   ```
 
   ```bash
@@ -118,7 +118,7 @@ EdgeX provides an [App-Service-Configurable](https://github.com/edgexfoundry/app
 - Check the logs for `app-ibm-mqtt-export`
 
   ```bash
-  docker-compose -p edgex logs app-ibm-mqtt-export
+  docker compose -p edgex logs app-ibm-mqtt-export
   ```
 
   ```bash

diff --git a/application-services/custom/advanced-filter-convert-publish/README.md b/application-services/custom/advanced-filter-convert-publish/README.md
@@ -20,7 +20,7 @@ TODO: Update link to `minnesota` branch
    - [ ] start edgex which includes Device Virtual
 
        ```
-       docker-compose -p edgex -f docker-compose-no-secty.yml up -d
+       docker compose -p edgex -f docker-compose-no-secty.yml up -d
        ```
 
 2. Build & run **Advanced App Functions** example

diff --git a/application-services/custom/advanced-target-type/README.md b/application-services/custom/advanced-target-type/README.md
@@ -11,7 +11,7 @@ To run this example:
     - [ ] start edgex which includes Device Virtual
 
         ```
-        docker-compose -p edgex -f docker-compose-no-secty.yml up -d
+        docker compose -p edgex -f docker-compose-no-secty.yml up -d
         ```
 
 1.  Clone **[edgex-examples](https://github.com/edgexfoundry/edgex-examples)** repo

diff --git a/application-services/custom/camera-management/web-ui/Makefile b/application-services/custom/camera-management/web-ui/Makefile
@@ -45,8 +45,8 @@ DOCKER_RUN_EX = docker run \
 # usage: $(DOCKER_RUN) command here
 DOCKER_RUN = $(call DOCKER_RUN_EX,)
 
-# default docker-compose command and arguments
-DOCKER_COMPOSE = docker-compose -f docker-compose.yml -p camera-management-web-ui
+# default docker compose command and arguments
+DOCKER_COMPOSE = docker compose -f docker-compose.yml -p camera-management-web-ui
 
 OPEN = xdg-open
 

diff --git a/application-services/custom/camera-management/web-ui/README.md b/application-services/custom/camera-management/web-ui/README.md
@@ -9,7 +9,7 @@ The Camera Management Web UI is an Angular interface that provides features such
 
 
 ## How do I build this thing?
-This project is intended to be built and run using only `make`, `docker`, and `docker-compose` without the need
+This project is intended to be built and run using only `make`, `docker`, and `docker compose` without the need
 for installing `npm` or `nodejs`.
 
 To skip the technical details, jump to **[Initial Setup](#Initial-Setup)**
@@ -119,10 +119,10 @@ make force-install
 # Desktop x11 environment is mapped and programs such as google-chrome can be ran in GUI mode
 make debug
 
-# Tail docker-compose logs (`n` is optional amount of lines to tail first)
+# Tail docker compose logs (`n` is optional amount of lines to tail first)
 make tail [n=XXX]
 
-# Prints docker-compose logs and exits (`n` is optional amount of lines to print)
+# Prints docker compose logs and exits (`n` is optional amount of lines to print)
 make logs [n=XXX] 
 
 # Generate documentation

diff --git a/application-services/custom/secrets/README.md b/application-services/custom/secrets/README.md
@@ -41,13 +41,13 @@ Please refer to the [Application Functions SDK documentation](https://docs.edgex
    Run the following command from the same folder the compose file resides.
 
    ```console
-   docker-compose -p edgex up -d
+   docker compose -p edgex up -d
    ```
 
    Now all the EdgeX service will be running. This can be verified by running the following command:
 
    ```console
-   docker-compose -p edgex ps
+   docker compose -p edgex ps
    ```
 
    Which will output the following:

diff --git a/application-services/custom/send-command/README.md b/application-services/custom/send-command/README.md
@@ -11,7 +11,7 @@ This Application Service example demonstrates how to use the `Command` client to
 * Ensure that EdgeX is running including Device Virtual Service. Run the follow command to achieve this
 
   ```bash
-  curl https://raw.githubusercontent.com/edgexfoundry/edgex-compose/ireland/docker-compose-no-secty.yml -o docker-compose.yml; docker-compose -p edgex up -d
+  curl https://raw.githubusercontent.com/edgexfoundry/edgex-compose/ireland/docker-compose-no-secty.yml -o docker-compose.yml; docker compose -p edgex up -d
   ```
 
 - Install PostMan (https://www.postman.com/)

diff --git a/application-services/custom/simple-cbor-filter/README.md b/application-services/custom/simple-cbor-filter/README.md
@@ -18,7 +18,7 @@ TODO: replace 'main' with 'minnesota'
    - [ ] start edgex 
 
      ```
-     docker-compose -p edgex -f docker-compose-no-secty.yml up -d
+     docker compose -p edgex -f docker-compose-no-secty.yml up -d
      ```
 
 3. Build & run **simple-cbor-filter** example

diff --git a/deployment/helm/README.md b/deployment/helm/README.md
@@ -229,7 +229,7 @@ spec:
       automountServiceAccountToken: false
       containers:
       - name: security-proxy-setup
-        image: nexus3.edgexfoundry.org:10004/security-proxy-setup:latest
+        image: nexus3.edgexfoundry.org:10004/security-proxy-setup:3.0.0
         imagePullPolicy: Always
         command: ["/edgex-init/ready_to_run_wait_install.sh"]
         args: ["/edgex/secrets-config", "proxy", "adduser", "--user", "edgexuser", "--useRootToken"]

diff --git a/deployment/raspberry-pi-4/20_install_packages.md b/deployment/raspberry-pi-4/20_install_packages.md
@@ -102,18 +102,18 @@ Build: $Id: 6a6c9c332d5354ddf1f8a2da3cc477bd18d2be53 $
 
 <br/>
 
-## 2.6 Install Docker and Docker-compose
+## 2.6 Install Docker and Docker compose v2
 
-Docker is a containerization platform/tool. EdgeX' core services are conveniently packaged as docker containers so that we can leverage Docker to run EdgeX. To install Docker and Docker-compose:
+Docker is a containerization platform/tool. EdgeX' core services are conveniently packaged as docker containers so that we can leverage Docker to run EdgeX. To install Docker and Docker compose v2:
 ```sh
 # Install Docker
 $ sudo apt install -y docker.io
 
 # To confirm the versions installed 
 $ docker -v
-Docker version 20.10.7, build 20.10.7-0ubuntu5.1
-$ docker-compose -v
-docker-compose version 1.27.4, build unknown
+Docker version 20.10.21, build baeda1f
+$ docker compose version
+Docker Compose version v2.16.0
 
 # Enable and start the Docker daemon
 $ sudo systemctl enable docker

diff --git a/deployment/raspberry-pi-4/30_install_edgex.md b/deployment/raspberry-pi-4/30_install_edgex.md
@@ -45,7 +45,7 @@ taf
 # With these criteria, we will use "docker-compose-no-secty-arm64.yml". 
 
 # This command launches the stack but might take couple minutes depends on the network.
-$ docker-compose -f docker-compose-no-secty-arm64.yml up -d
+$ docker compose -f docker-compose-no-secty-arm64.yml up -d
 ...
 Creating edgex-ui-go       ... done
 Creating edgex-redis       ... done
@@ -106,9 +106,9 @@ $ curl http://localhost:59882/api/v2/ping
 {"apiVersion":"v2","timestamp":"Mon Jan 10 22:45:56 UTC 2022"}
 ```
 
-Also docker-compose can be used to monitor logs:
+Also docker compose can be used to monitor logs:
 ```sh
-$ docker-compose -f docker-compose-no-secty-arm64.yml logs -f
+$ docker compose -f docker-compose-no-secty-arm64.yml logs -f
 ```
 
 <br/>
@@ -122,7 +122,7 @@ A local web service "Portainer" can be launched to monitor Docker services but i
 $ vi docker-compose-portainer.yml
 
 # Then launch it with this command.
-$ docker-compose -f docker-compose-portainer.yml up -d
+$ docker compose -f docker-compose-portainer.yml up -d
 ```
 
 <br/>

diff --git a/deployment/raspberry-pi-4/40_custom_device_services.md b/deployment/raspberry-pi-4/40_custom_device_services.md
@@ -437,7 +437,7 @@ services:
 From there we can attempt to run the service:
 
 ```sh
-$ docker-compose up --build
+$ docker compose up --build
 ```
 
 Please open a new terminal, login to the RPI, and use **curl** to check the state of the device service:

diff --git a/deployment/raspberry-pi-4/50_custom_app_services.md b/deployment/raspberry-pi-4/50_custom_app_services.md
@@ -303,7 +303,7 @@ services:
 From there we can attempt to run the service:
 
 ```sh
-$ docker-compose up --build
+$ docker compose up --build
 ```
 
 Once services start the logs should be fairly quiet - we will need to set an echo value before the events start sending: