gitlab-janitor 1.0.3.92955 → 1.0.4.94895

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9e58396db2973edbd2fd0007703dca9f050c2be3f5adee3fef0bd5b92b9f315
-  data.tar.gz: a445da15502ff611f4dee05c18b1d36794c353d1f5a529110fbc89eb21d9bf01
+  metadata.gz: 14f26d242228d00c0f522100f187ce589117719d33317d98108d261f2d1e3fe9
+  data.tar.gz: fb6db353ef3800a2336678c2ca09d60914c6cce9c2d3c0368eec65e2d866c677
 SHA512:
-  metadata.gz: 762f871e63cfd023f903fc4d843d7e87bc0e2099c6f64b3a9082c6b12408f39c839351cb3218022f0d366379574b09309f5ecffed170fb1d7c62332af412a7c8
-  data.tar.gz: 6fda5e2b03d3c738f43dd740a45a93e26adbe10335ee73bb38b91a9d42b2656c6c2577e754bd5c6cdca0035e00593223155cdae6d7461f78dfb703cdddf78bf4
+  metadata.gz: 21c792b8a83b65dd62b1a33f11db7c7b5bb6dfce85395e8eeec2a6ca325a78b1c936b39155a7dd5d63364a4ca6c33af42bcc7a489e04ad23abe944ba614841ad
+  data.tar.gz: 56796debf5eead9f11b4e60ef31e1a242b2f673019812d25dd0b429fc8685d2a5fe7f321b7095a699230b7c14fe5bf886c743908567fad8a7db5b6eabdcc550f

data/Dockerfile

@@ -11,10 +11,15 @@ RUN mkdir -p /usr/local/etc \
   } >> /usr/local/etc/gemrc \
   && echo 'gem: --no-document' > ~/.gemrc
 
+ENV \
+  BUILDKIT_INLINE_CACHE="1" \
+  BUILDKIT_PROGRESS="plain" \
+  DOCKER_BUILDKIT="1" \
+  DOCKER_CLI_EXPERIMENTAL="1" 
+
 RUN set -ex \
   && apk add --no-cache docker-cli
 
-
 ADD Gemfile Gemfile.lock gitlab-janitor.gemspec /home/app/
 ADD lib/gitlab_janitor/version.rb /home/app/lib/gitlab_janitor/
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-janitor (1.0.3.92955)
+    gitlab-janitor (1.0.4.94895)
       activesupport (~> 6.0)
       docker-api
       fugit
@@ -34,12 +34,12 @@ GEM
       raabro (~> 1.4)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    minitest (5.16.2)
+    minitest (5.16.3)
     multi_json (1.15.0)
     optparse (0.2.0)
     raabro (1.4.0)
     rake (13.0.6)
-    redis (4.7.1)
+    redis (4.8.0)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -69,12 +69,13 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.1)
+    tzinfo-data (1.2022.3)
       tzinfo (>= 1.0.0)
     unicode-display_width (2.2.0)
     zeitwerk (2.6.0)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -88,4 +89,4 @@ DEPENDENCIES
   simplecov-console
 
 BUNDLED WITH
-   2.3.11
+   2.3.20

data/lib/gitlab_janitor/cache_cleaner.rb

@@ -10,14 +10,28 @@ module GitlabJanitor
     def do_clean(keep_size: '10G', remove: false)
       logger.info 'Removing cache...'
       if remove
-        out, _status = Open3.capture2e("docker builder prune --keep-storage #{keep_size} -f")
-        logger.info(out)
+        prune_builder(keep_size)
+        prune_buildx(keep_size)
       else
         logger.info 'Skip removal due to dry run'
       end
       out, _status = Open3.capture2e('docker system df')
       logger.info(out)
     end
+    
+    def prune_builder(keep_size)
+      out, _status = Open3.capture2e("docker builder prune --keep-storage #{keep_size} -f")
+      logger.info(out)
+    rescue StandardError =>e
+      logger.warn("Unable to clean BUILDER: #{e.inspect}")
+    end
+    
+    def prune_buildx(keep_size)
+      out, _status = Open3.capture2e("docker buildx prune --keep-storage #{keep_size} -f")
+      logger.info(out)
+    rescue StandardError =>e
+      logger.warn("Unable to clean BUILDX: #{e.inspect}")
+    end
 
   end
 end

data/lib/gitlab_janitor/version.rb

@@ -1,6 +1,6 @@
 module GitlabJanitor
 
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-janitor
 version: !ruby/object:Gem::Version
-  version: 1.0.3.92955
+  version: 1.0.4.94895
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print