gitlab-janitor 1.0.3.92955 → 1.0.4.94864

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f9e58396db2973edbd2fd0007703dca9f050c2be3f5adee3fef0bd5b92b9f315
4
- data.tar.gz: a445da15502ff611f4dee05c18b1d36794c353d1f5a529110fbc89eb21d9bf01
3
+ metadata.gz: d6e5caf266616a88fc24a9cb28066cd41881281c1a0bd8ead2fee6ff84265366
4
+ data.tar.gz: 285aeb0635b8a80d773d2f1c78b7e81dae329f41bd9d40587b22f221a1f3d995
5
5
  SHA512:
6
- metadata.gz: 762f871e63cfd023f903fc4d843d7e87bc0e2099c6f64b3a9082c6b12408f39c839351cb3218022f0d366379574b09309f5ecffed170fb1d7c62332af412a7c8
7
- data.tar.gz: 6fda5e2b03d3c738f43dd740a45a93e26adbe10335ee73bb38b91a9d42b2656c6c2577e754bd5c6cdca0035e00593223155cdae6d7461f78dfb703cdddf78bf4
6
+ metadata.gz: d2617c7beb9b97853f39c9d92eb8c602a5ea1db3fc4d06bd646564024f968205da3cf6096d563b05039f4d7e8d51b88fc33f2f8c0bff8b2866ed8188e7524eaf
7
+ data.tar.gz: 400cb9f7630972599c88af849bbeb598f9217095ffcf993c3931f7af347d30fef4d35c9a6e691f62fc3bb6423056b9156dc43f99b7a951f2d4f787fa432d73f0
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gitlab-janitor (1.0.3.92955)
4
+ gitlab-janitor (1.0.4.94864)
5
5
  activesupport (~> 6.0)
6
6
  docker-api
7
7
  fugit
@@ -34,12 +34,12 @@ GEM
34
34
  raabro (~> 1.4)
35
35
  i18n (1.12.0)
36
36
  concurrent-ruby (~> 1.0)
37
- minitest (5.16.2)
37
+ minitest (5.16.3)
38
38
  multi_json (1.15.0)
39
39
  optparse (0.2.0)
40
40
  raabro (1.4.0)
41
41
  rake (13.0.6)
42
- redis (4.7.1)
42
+ redis (4.8.0)
43
43
  rspec (3.11.0)
44
44
  rspec-core (~> 3.11.0)
45
45
  rspec-expectations (~> 3.11.0)
@@ -69,12 +69,13 @@ GEM
69
69
  unicode-display_width (>= 1.1.1, < 3)
70
70
  tzinfo (2.0.5)
71
71
  concurrent-ruby (~> 1.0)
72
- tzinfo-data (1.2022.1)
72
+ tzinfo-data (1.2022.3)
73
73
  tzinfo (>= 1.0.0)
74
74
  unicode-display_width (2.2.0)
75
75
  zeitwerk (2.6.0)
76
76
 
77
77
  PLATFORMS
78
+ ruby
78
79
  x86_64-linux
79
80
 
80
81
  DEPENDENCIES
@@ -88,4 +89,4 @@ DEPENDENCIES
88
89
  simplecov-console
89
90
 
90
91
  BUNDLED WITH
91
- 2.3.11
92
+ 2.3.20
@@ -10,14 +10,28 @@ module GitlabJanitor
10
10
  def do_clean(keep_size: '10G', remove: false)
11
11
  logger.info 'Removing cache...'
12
12
  if remove
13
- out, _status = Open3.capture2e("docker builder prune --keep-storage #{keep_size} -f")
14
- logger.info(out)
13
+ prune_builder
14
+ prune_buildx
15
15
  else
16
16
  logger.info 'Skip removal due to dry run'
17
17
  end
18
18
  out, _status = Open3.capture2e('docker system df')
19
19
  logger.info(out)
20
20
  end
21
+
22
+ def prune_builder
23
+ out, _status = Open3.capture2e("docker builder prune --keep-storage #{keep_size} -f")
24
+ logger.info(out)
25
+ rescue StandardError =>e
26
+ logger.warn("Unable to clean BUILDER: #{e.inspect}")
27
+ end
28
+
29
+ def prune_buildx
30
+ out, _status = Open3.capture2e("docker buildx prune --keep-storage #{keep_size} -f")
31
+ logger.info(out)
32
+ rescue StandardError =>e
33
+ logger.warn("Unable to clean BUILDX: #{e.inspect}")
34
+ end
21
35
 
22
36
  end
23
37
  end
@@ -1,6 +1,6 @@
1
1
  module GitlabJanitor
2
2
 
3
- VERSION = '1.0.3'.freeze
3
+ VERSION = '1.0.4'.freeze
4
4
 
5
5
  end
6
6
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitlab-janitor
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3.92955
4
+ version: 1.0.4.94864
5
5
  platform: ruby
6
6
  authors:
7
7
  - Samoilenko Yuri
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-11 00:00:00.000000000 Z
11
+ date: 2022-08-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: awesome_print