build: Unpin patch versions for 3rd part deps

Signed-off-by: Leonard Goodell <leonard.goodell@intel.com>
edgexfoundry · Nov 28, 2023 · 960a9b4 · 960a9b4
1 parent 21f2339
commit 960a9b4
Show file tree

Hide file tree

Showing 21 changed files with 112 additions and 112 deletions.
diff --git a/compose-builder/.env b/compose-builder/.env
@@ -42,16 +42,16 @@ DEVICE_ONVIFCAM_VERSION=latest
 DEVICE_USBCAM_VERSION=latest
 
 # Lock on Vault 1.14 (last MPL-2.0 version)
-VAULT_VERSION=1.14.5
+VAULT_VERSION=1.14
 # Lock on Consul 1.16 (last MPL-2.0 version)
-CONSUL_VERSION=1.16.2
+CONSUL_VERSION=1.16
 # Lock on Redis 7.0 until EdgeX 4.0
-REDIS_VERSION=7.0.14-alpine
-KUIPER_VERSION=1.11.4-alpine
-MOSQUITTO_VERSION=2.0.18
-NANOMQ_VERSION=0.18.1
-NATS_VERSION=2.9.23-alpine
-NGINX_VERSION=1.25.3-alpine-slim
+REDIS_VERSION=7.0-alpine
+KUIPER_VERSION=1.11-alpine
+MOSQUITTO_VERSION=2.0
+NANOMQ_VERSION=0.18
+NATS_VERSION=2.9-alpine
+NGINX_VERSION=1.25-alpine-slim
 EDGEX_USER=2002
 EDGEX_GROUP=2001
 

diff --git a/docker-compose-arm64.yml b/docker-compose-arm64.yml
@@ -134,7 +134,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-core-consul
-    image: hashicorp/consul:1.16.2
+    image: hashicorp/consul:1.16
     networks:
       edgex-network: null
     ports:
@@ -478,7 +478,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-redis
-    image: redis:7.0.14-alpine
+    image: redis:7.0-alpine
     networks:
       edgex-network: null
     ports:
@@ -682,7 +682,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-nginx
-    image: nginx:1.25.3-alpine-slim
+    image: nginx:1.25-alpine-slim
     networks:
       edgex-network:
         aliases:
@@ -753,7 +753,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-kuiper
-    image: lfedge/ekuiper:1.11.4-alpine
+    image: lfedge/ekuiper:1.11-alpine
     networks:
       edgex-network: null
     ports:
@@ -1253,7 +1253,7 @@ services:
       VAULT_CONFIG_DIR: /vault/config
       VAULT_UI: "true"
     hostname: edgex-vault
-    image: hashicorp/vault:1.14.5
+    image: hashicorp/vault:1.14
     networks:
       edgex-network: null
     ports:

diff --git a/docker-compose-no-secty-arm64.yml b/docker-compose-no-secty-arm64.yml
@@ -69,7 +69,7 @@ services:
     - 0.0.0.0
     container_name: edgex-core-consul
     hostname: edgex-core-consul
-    image: hashicorp/consul:1.16.2
+    image: hashicorp/consul:1.16
     networks:
       edgex-network: null
     ports:
@@ -223,7 +223,7 @@ services:
   database:
     container_name: edgex-redis
     hostname: edgex-redis
-    image: redis:7.0.14-alpine
+    image: redis:7.0-alpine
     networks:
       edgex-network: null
     ports:
@@ -328,7 +328,7 @@ services:
       KUIPER__BASIC__CONSOLELOG: "true"
       KUIPER__BASIC__RESTPORT: "59720"
     hostname: edgex-kuiper
-    image: lfedge/ekuiper:1.11.4-alpine
+    image: lfedge/ekuiper:1.11-alpine
     networks:
       edgex-network: null
     ports:

diff --git a/docker-compose-no-secty-with-app-sample-arm64.yml b/docker-compose-no-secty-with-app-sample-arm64.yml
@@ -105,7 +105,7 @@ services:
     - 0.0.0.0
     container_name: edgex-core-consul
     hostname: edgex-core-consul
-    image: hashicorp/consul:1.16.2
+    image: hashicorp/consul:1.16
     networks:
       edgex-network: null
     ports:
@@ -259,7 +259,7 @@ services:
   database:
     container_name: edgex-redis
     hostname: edgex-redis
-    image: redis:7.0.14-alpine
+    image: redis:7.0-alpine
     networks:
       edgex-network: null
     ports:
@@ -364,7 +364,7 @@ services:
       KUIPER__BASIC__CONSOLELOG: "true"
       KUIPER__BASIC__RESTPORT: "59720"
     hostname: edgex-kuiper
-    image: lfedge/ekuiper:1.11.4-alpine
+    image: lfedge/ekuiper:1.11-alpine
     networks:
       edgex-network: null
     ports:

diff --git a/docker-compose-no-secty-with-app-sample.yml b/docker-compose-no-secty-with-app-sample.yml
@@ -105,7 +105,7 @@ services:
     - 0.0.0.0
     container_name: edgex-core-consul
     hostname: edgex-core-consul
-    image: hashicorp/consul:1.16.2
+    image: hashicorp/consul:1.16
     networks:
       edgex-network: null
     ports:
@@ -259,7 +259,7 @@ services:
   database:
     container_name: edgex-redis
     hostname: edgex-redis
-    image: redis:7.0.14-alpine
+    image: redis:7.0-alpine
     networks:
       edgex-network: null
     ports:
@@ -364,7 +364,7 @@ services:
       KUIPER__BASIC__CONSOLELOG: "true"
       KUIPER__BASIC__RESTPORT: "59720"
     hostname: edgex-kuiper
-    image: lfedge/ekuiper:1.11.4-alpine
+    image: lfedge/ekuiper:1.11-alpine
     networks:
       edgex-network: null
     ports:

diff --git a/docker-compose-no-secty.yml b/docker-compose-no-secty.yml
@@ -69,7 +69,7 @@ services:
     - 0.0.0.0
     container_name: edgex-core-consul
     hostname: edgex-core-consul
-    image: hashicorp/consul:1.16.2
+    image: hashicorp/consul:1.16
     networks:
       edgex-network: null
     ports:
@@ -223,7 +223,7 @@ services:
   database:
     container_name: edgex-redis
     hostname: edgex-redis
-    image: redis:7.0.14-alpine
+    image: redis:7.0-alpine
     networks:
       edgex-network: null
     ports:
@@ -328,7 +328,7 @@ services:
       KUIPER__BASIC__CONSOLELOG: "true"
       KUIPER__BASIC__RESTPORT: "59720"
     hostname: edgex-kuiper
-    image: lfedge/ekuiper:1.11.4-alpine
+    image: lfedge/ekuiper:1.11-alpine
     networks:
       edgex-network: null
     ports:

diff --git a/docker-compose-with-app-sample-arm64.yml b/docker-compose-with-app-sample-arm64.yml
@@ -205,7 +205,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-core-consul
-    image: hashicorp/consul:1.16.2
+    image: hashicorp/consul:1.16
     networks:
       edgex-network: null
     ports:
@@ -549,7 +549,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-redis
-    image: redis:7.0.14-alpine
+    image: redis:7.0-alpine
     networks:
       edgex-network: null
     ports:
@@ -753,7 +753,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-nginx
-    image: nginx:1.25.3-alpine-slim
+    image: nginx:1.25-alpine-slim
     networks:
       edgex-network:
         aliases:
@@ -824,7 +824,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-kuiper
-    image: lfedge/ekuiper:1.11.4-alpine
+    image: lfedge/ekuiper:1.11-alpine
     networks:
       edgex-network: null
     ports:
@@ -1324,7 +1324,7 @@ services:
       VAULT_CONFIG_DIR: /vault/config
       VAULT_UI: "true"
     hostname: edgex-vault
-    image: hashicorp/vault:1.14.5
+    image: hashicorp/vault:1.14
     networks:
       edgex-network: null
     ports:

diff --git a/docker-compose-with-app-sample.yml b/docker-compose-with-app-sample.yml
@@ -205,7 +205,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-core-consul
-    image: hashicorp/consul:1.16.2
+    image: hashicorp/consul:1.16
     networks:
       edgex-network: null
     ports:
@@ -549,7 +549,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-redis
-    image: redis:7.0.14-alpine
+    image: redis:7.0-alpine
     networks:
       edgex-network: null
     ports:
@@ -753,7 +753,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-nginx
-    image: nginx:1.25.3-alpine-slim
+    image: nginx:1.25-alpine-slim
     networks:
       edgex-network:
         aliases:
@@ -824,7 +824,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-kuiper
-    image: lfedge/ekuiper:1.11.4-alpine
+    image: lfedge/ekuiper:1.11-alpine
     networks:
       edgex-network: null
     ports:
@@ -1324,7 +1324,7 @@ services:
       VAULT_CONFIG_DIR: /vault/config
       VAULT_UI: "true"
     hostname: edgex-vault
-    image: hashicorp/vault:1.14.5
+    image: hashicorp/vault:1.14
     networks:
       edgex-network: null
     ports:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -134,7 +134,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-core-consul
-    image: hashicorp/consul:1.16.2
+    image: hashicorp/consul:1.16
     networks:
       edgex-network: null
     ports:
@@ -478,7 +478,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-redis
-    image: redis:7.0.14-alpine
+    image: redis:7.0-alpine
     networks:
       edgex-network: null
     ports:
@@ -682,7 +682,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-nginx
-    image: nginx:1.25.3-alpine-slim
+    image: nginx:1.25-alpine-slim
     networks:
       edgex-network:
         aliases:
@@ -753,7 +753,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-kuiper
-    image: lfedge/ekuiper:1.11.4-alpine
+    image: lfedge/ekuiper:1.11-alpine
     networks:
       edgex-network: null
     ports:
@@ -1253,7 +1253,7 @@ services:
       VAULT_CONFIG_DIR: /vault/config
       VAULT_UI: "true"
     hostname: edgex-vault
-    image: hashicorp/vault:1.14.5
+    image: hashicorp/vault:1.14
     networks:
       edgex-network: null
     ports:

diff --git a/taf/docker-compose-taf-arm64.yml b/taf/docker-compose-taf-arm64.yml
@@ -556,7 +556,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-core-consul
-    image: hashicorp/consul:1.16.2
+    image: hashicorp/consul:1.16
     networks:
       edgex-network: null
     ports:
@@ -900,7 +900,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-redis
-    image: redis:7.0.14-alpine
+    image: redis:7.0-alpine
     networks:
       edgex-network: null
     ports:
@@ -1260,7 +1260,7 @@ services:
     - /mosquitto-no-auth.conf
     container_name: edgex-mqtt-broker
     hostname: edgex-mqtt-broker
-    image: eclipse-mosquitto:2.0.18
+    image: eclipse-mosquitto:2.0
     networks:
       edgex-network: null
     ports:
@@ -1281,7 +1281,7 @@ services:
     - /mosquitto-no-auth.conf
     container_name: edgex-taf-mqtt-broker
     hostname: edgex-taf-mqtt-broker
-    image: eclipse-mosquitto:2.0.18
+    image: eclipse-mosquitto:2.0
     networks:
       edgex-network: null
     ports:
@@ -1324,7 +1324,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-nginx
-    image: nginx:1.25.3-alpine-slim
+    image: nginx:1.25-alpine-slim
     networks:
       edgex-network:
         aliases:
@@ -1395,7 +1395,7 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-kuiper
-    image: lfedge/ekuiper:1.11.4-alpine
+    image: lfedge/ekuiper:1.11-alpine
     networks:
       edgex-network: null
     ports:
@@ -2159,7 +2159,7 @@ services:
       VAULT_CONFIG_DIR: /vault/config
       VAULT_UI: "true"
     hostname: edgex-vault
-    image: hashicorp/vault:1.14.5
+    image: hashicorp/vault:1.14
     networks:
       edgex-network: null
     ports: