Merge pull request #138 from ProblemSetters/dockerce-version-unlock

ya-developer · web-flow · commit af9e73aff4dd · 2025-04-21T16:17:09.000+03:00
Unlock "docker-ce" version to the latest, small performance fixes
diff --git a/framework/inventory/ansible.inventory b/framework/inventory/ansible.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.ansible() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/awscli.inventory b/framework/inventory/awscli.inventory
@@ -24,7 +24,7 @@ blackbox.framework.inventory.awscli() {
   }
 
   if [[ ! -x "/usr/local/aws-cli/v2/current/bin/aws" ]]; then
-    if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+    if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
       apt update
     fi
 
diff --git a/framework/inventory/boto3.inventory b/framework/inventory/boto3.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.boto3() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/chef-workstation.inventory b/framework/inventory/chef-workstation.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.chef-workstation() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/chef.inventory b/framework/inventory/chef.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.chef() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/cron.inventory b/framework/inventory/cron.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.cron() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/discover.inventory b/framework/inventory/discover.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.discover() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/docker-ce.inventory b/framework/inventory/docker-ce.inventory
@@ -31,15 +31,15 @@ blackbox.framework.inventory.docker-ce() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
   DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends software-properties-common gpg-agent wget && {
     wget -S --output-document="/dev/stdout" --no-verbose https://download.docker.com/linux/ubuntu/gpg | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true apt-key add -
     add-apt-repository -y "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
 
-    local version=5:26.0.0-1~ubuntu.22.04~jammy
+    local version=5:28.1.1-1~ubuntu.22.04~jammy
 
     DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends docker-ce="$version" docker-ce-cli="$version" docker-buildx-plugin "${with_packages[@]}" && {
       # Docker ulimit issue quickfix: https://github.com/docker/cli/issues/4807
diff --git a/framework/inventory/docker-compose.inventory b/framework/inventory/docker-compose.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.docker-compose() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/gawk.inventory b/framework/inventory/gawk.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.gawk() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/git.inventory b/framework/inventory/git.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.git() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/jenkins.inventory b/framework/inventory/jenkins.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.jenkins() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/jq.inventory b/framework/inventory/jq.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.jq() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/k3s.inventory b/framework/inventory/k3s.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.k3s() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/kafka.inventory b/framework/inventory/kafka.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.kafka() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/localstack.inventory b/framework/inventory/localstack.inventory
@@ -23,6 +23,6 @@ blackbox.framework.inventory.localstack() {
     blackbox.framework.trace "${FUNCNAME[0]}" "$*" <<<""
   }
 
-  docker run -di -p 4566:4566 --cgroupns=host "134148934511.dkr.ecr.us-east-1.amazonaws.com/hr/${package_name}:2.1.0-slim"
+  docker run -di -p 4566:4566 --cgroupns=host "134148934511.dkr.ecr.us-east-1.amazonaws.com/hr/${package_name}:2.1.0"
   sleep 30 # TODO: implement launcher
 }
diff --git a/framework/inventory/microceph.inventory b/framework/inventory/microceph.inventory
@@ -32,7 +32,7 @@ blackbox.framework.inventory.microceph() {
   fi
 
   {
-    if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+    if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
       apt update
     fi
 
diff --git a/framework/inventory/nmap.inventory b/framework/inventory/nmap.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.nmap() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/openssh-client.inventory b/framework/inventory/openssh-client.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.openssh-client() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/perl.inventory b/framework/inventory/perl.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.perl() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/php-cli.inventory b/framework/inventory/php-cli.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.php-cli() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/puppet-agent.inventory b/framework/inventory/puppet-agent.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.puppet-agent() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/python3.inventory b/framework/inventory/python3.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.python3() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/redis.inventory b/framework/inventory/redis.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.redis() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/ruby-full.inventory b/framework/inventory/ruby-full.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.ruby-full() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/terraform-local.inventory b/framework/inventory/terraform-local.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.terraform-local() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/terraform.inventory b/framework/inventory/terraform.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.terraform() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/framework/inventory/yq.inventory b/framework/inventory/yq.inventory
@@ -31,7 +31,7 @@ blackbox.framework.inventory.yq() {
     return
   fi
 
-  if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then
+  if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then
     apt update
   fi
 
diff --git a/module/linux/check/provision/Dockerfile b/module/linux/check/provision/Dockerfile
@@ -1,14 +1 @@
 FROM 134148934511.dkr.ecr.us-east-1.amazonaws.com/hr/blackbox_2204:abstract
-
-SHELL ["/bin/bash", "-c"]
-
-RUN source \
-      /blackbox/blackbox \
-        \
-        &>/dev/null; \
-    blackbox.framework.inventory.provision \
-      gawk \
-    && \
-    rm \
-      -rf \
-      /var/lib/apt/lists/*

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ blackbox.framework.inventory.awscli() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`if [[ ! -x "/usr/local/aws-cli/v2/current/bin/aws" ]]; then`
`27`		`- if [ -z "$(find /var/lib/apt/lists -newermt "5 minutes ago")" ]; then`
	`27`	`+ if [ -z "$(find /var/lib/apt/lists -mindepth 1 -newermt "5 minutes ago")" ]; then`
`28`	`28`	`apt update`
`29`	`29`	`fi`
`30`	`30`