avm-eac_ubuntu_base0 0.5.0 → 0.6.0

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.
Files changed (15) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/eac_ubuntu_base0/apache/resource.rb +0 -2
  3. data/lib/avm/eac_ubuntu_base0/apache.rb +0 -2
  4. data/lib/avm/eac_ubuntu_base0/docker_image.rb +6 -4
  5. data/lib/avm/eac_ubuntu_base0/instances/base.rb +0 -4
  6. data/lib/avm/eac_ubuntu_base0/rspec/ssh_docker_server.rb +9 -11
  7. data/lib/avm/eac_ubuntu_base0/runners/base/docker.rb +0 -4
  8. data/lib/avm/eac_ubuntu_base0/runners/base.rb +0 -4
  9. data/lib/avm/eac_ubuntu_base0/version.rb +1 -1
  10. data/lib/avm/eac_ubuntu_base0.rb +6 -2
  11. data/template/avm/eac_ubuntu_base0/docker_image/Dockerfile.template +4 -2
  12. data/template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/{Dockerfile → Dockerfile.template} +2 -2
  13. metadata +18 -28
  14. data/lib/avm/eac_ubuntu_base0/instances.rb +0 -11
  15. data/lib/avm/eac_ubuntu_base0/rspec.rb +0 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8fbfffd788055d5bfa95d33b4bc0acf445159bbb854547fe929799df16c2db3a
4
- data.tar.gz: fc4d7aa8c505885cef5116feeea5681eb8dd6aa0154e2967b61d81d11f243ab5
3
+ metadata.gz: b1126f033538256d06e61d74b5ef8a45dd51128c202a758baac047250267f388
4
+ data.tar.gz: 6e3f1cd3af156639e72f4051a9a29186049da37951011b54cf88e86627bf3a85
5
5
  SHA512:
6
- metadata.gz: 9fd9f2554c3a58dcc38c659c21dd6c2f6b0a2b77cf1ee721d6110cd85f43f84cff50cf00e1fa6792d90ed9b958a6b972ef90a999b578663db2b3818da4f04b11
7
- data.tar.gz: 39c4248d19bb07984c783a816a7fd603899b52f824e5b64391e5de7a1182580335b2a46d316ac52419c61ae692f9e01938d89f1f551e1e1f6e4267a60537a992
6
+ metadata.gz: e5c6faeb9dd9d11804aa715ca91ec390c2b678b0765ecbc9542054b44c53960f8072bac23926483a4265fc79b9029e5856f4cc93fa05e3a31450afd1b6296816
7
+ data.tar.gz: c5344f3a7a9b8d622b6057a84c1394c0a8ffc70c39ff1e6d92de69553ed2dca41cd7fc04b233741e325d3252a39938b3d93eb88db2d201a70b0b782a4166747a
data/lib/avm/eac_ubuntu_base0/apache/resource.rb CHANGED
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
4
-
5
3
  module Avm
6
4
  module EacUbuntuBase0
7
5
  class Apache
data/lib/avm/eac_ubuntu_base0/apache.rb CHANGED
@@ -1,7 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
4
-
5
3
  module Avm
6
4
  module EacUbuntuBase0
7
5
  class Apache
data/lib/avm/eac_ubuntu_base0/docker_image.rb CHANGED
@@ -1,14 +1,16 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/docker/image'
4
- require 'eac_templates/sources/from_all_gems'
5
- require 'eac_ruby_utils/core_ext'
6
-
7
3
  module Avm
8
4
  module EacUbuntuBase0
9
5
  class DockerImage < ::Avm::Docker::Image
6
+ BASE_IMAGE = 'ubuntu:24.04'
10
7
  USER_NAME = 'myuser'
11
8
 
9
+ # @return [String]
10
+ def base_image
11
+ BASE_IMAGE
12
+ end
13
+
12
14
  def stereotype_tag
13
15
  'eac_ubuntu_base0'
14
16
  end
data/lib/avm/eac_ubuntu_base0/instances/base.rb CHANGED
@@ -1,9 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/eac_ubuntu_base0/apache'
4
- require 'avm/eac_ubuntu_base0/docker_image'
5
- require 'avm/instances/base'
6
-
7
3
  module Avm
8
4
  module EacUbuntuBase0
9
5
  module Instances
data/lib/avm/eac_ubuntu_base0/rspec/ssh_docker_server.rb CHANGED
@@ -1,13 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_docker/images/templatized'
4
- require 'eac_ruby_utils/core_ext'
5
- require 'eac_templates/core_ext'
6
-
7
3
  module Avm
8
4
  module EacUbuntuBase0
9
5
  module Rspec
10
6
  class SshDockerServer < ::EacDocker::Images::Templatized
7
+ def base_image
8
+ ::Avm::EacUbuntuBase0::DockerImage::BASE_IMAGE
9
+ end
10
+
11
11
  # @return [EacRubyUtils::Envs::SshEnv]
12
12
  def env
13
13
  raise '@env is blank' if @env.blank?
@@ -15,11 +15,9 @@ module Avm
15
15
  @env
16
16
  end
17
17
 
18
- def on_run
18
+ def on_run(&block)
19
19
  on_container do
20
- on_env do
21
- yield
22
- end
20
+ on_env(&block)
23
21
  end
24
22
  end
25
23
 
@@ -73,9 +71,9 @@ module Avm
73
71
  @identity_file = env_identity_file_good_permissions
74
72
  @env = ::EacRubyUtils::Envs::SshEnv.new(
75
73
  "ssh://root@#{container.hostname}" \
76
- '?StrictHostKeyChecking=no' \
77
- '&BatchMode=yes' \
78
- "&IdentityFile=#{@identity_file}"
74
+ '?StrictHostKeyChecking=no' \
75
+ '&BatchMode=yes' \
76
+ "&IdentityFile=#{@identity_file}"
79
77
  )
80
78
  end
81
79
  end
data/lib/avm/eac_ubuntu_base0/runners/base/docker.rb CHANGED
@@ -1,9 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/docker/runner'
4
- require 'avm/runners/base'
5
- require 'eac_ruby_utils/struct'
6
-
7
3
  module Avm
8
4
  module EacUbuntuBase0
9
5
  module Runners
data/lib/avm/eac_ubuntu_base0/runners/base.rb CHANGED
@@ -1,9 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'avm/runners/base'
4
- require 'avm/eac_ubuntu_base0/instances/base'
5
- require 'eac_ruby_utils/patches/module/require_sub'
6
-
7
3
  module Avm
8
4
  module EacUbuntuBase0
9
5
  module Runners
data/lib/avm/eac_ubuntu_base0/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacUbuntuBase0
5
- VERSION = '0.5.0'
5
+ VERSION = '0.6.0'
6
6
  end
7
7
  end
data/lib/avm/eac_ubuntu_base0.rb CHANGED
@@ -1,9 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- require 'eac_ruby_utils/core_ext'
3
+ require 'eac_ruby_utils'
4
+ EacRubyUtils::RootModuleSetup.perform __FILE__
4
5
 
5
6
  module Avm
6
7
  module EacUbuntuBase0
7
- require_sub __FILE__
8
8
  end
9
9
  end
10
+
11
+ require 'avm'
12
+ require 'eac_docker'
13
+ require 'eac_templates'
data/template/avm/eac_ubuntu_base0/docker_image/Dockerfile.template CHANGED
@@ -1,4 +1,4 @@
1
- FROM ubuntu:20.04
1
+ FROM %%base_image%%
2
2
 
3
3
  # Base system update
4
4
  ENV DEBIAN_FRONTEND=noninteractive
@@ -11,7 +11,9 @@ RUN ln -fs /usr/share/zoneinfo/America/Sao_Paulo /etc/localtime
11
11
  RUN dpkg-reconfigure --frontend noninteractive tzdata
12
12
 
13
13
  # Default user
14
- RUN /usr/sbin/useradd --shell /bin/bash --home-dir %%user_home%% --create-home %%user_name%%
14
+ RUN /usr/sbin/groupmod --new-name '%%user_name%%' ubuntu
15
+ RUN /usr/sbin/usermod --shell /bin/bash --home %%user_home%% --move-home --login %%user_name%% \
16
+ ubuntu
15
17
  RUN /bin/echo '%%user_name%%:%%user_password%%' | /usr/sbin/chpasswd
16
18
  RUN /bin/chown %%user_name%%:%%user_name%% %%user_home%% -R
17
19
 
data/template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/{Dockerfile → Dockerfile.template} RENAMED
@@ -1,4 +1,4 @@
1
- FROM ubuntu:18.04
1
+ FROM '%%base_image%%'
2
2
  MAINTAINER Aleksandar Diklic "https://github.com/rastasheep"
3
3
 
4
4
  RUN apt-get update
@@ -11,7 +11,7 @@ RUN echo 'root:root' |chpasswd
11
11
  RUN sed -ri 's/^#?PermitRootLogin\s+.*/PermitRootLogin yes/' /etc/ssh/sshd_config
12
12
  RUN sed -ri 's/UsePAM yes/#UsePAM yes/g' /etc/ssh/sshd_config
13
13
 
14
- RUN mkdir /root/.ssh
14
+ RUN mkdir -p /root/.ssh
15
15
  ADD id_rsa /root/.ssh/id_rsa
16
16
  ADD id_rsa.pub /root/.ssh/id_rsa.pub
17
17
  ADD id_rsa.pub /root/.ssh/authorized_keys
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avm-eac_ubuntu_base0
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Put here the authors
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-06-04 00:00:00.000000000 Z
11
+ date: 2025-08-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -16,76 +16,68 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.77'
19
+ version: '0.97'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '0.77'
26
+ version: '0.97'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: eac_ruby_utils
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0.117'
33
+ version: '0.128'
34
34
  - - ">="
35
35
  - !ruby/object:Gem::Version
36
- version: 0.117.1
36
+ version: 0.128.3
37
37
  type: :runtime
38
38
  prerelease: false
39
39
  version_requirements: !ruby/object:Gem::Requirement
40
40
  requirements:
41
41
  - - "~>"
42
42
  - !ruby/object:Gem::Version
43
- version: '0.117'
43
+ version: '0.128'
44
44
  - - ">="
45
45
  - !ruby/object:Gem::Version
46
- version: 0.117.1
46
+ version: 0.128.3
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: eac_templates
49
49
  requirement: !ruby/object:Gem::Requirement
50
50
  requirements:
51
51
  - - "~>"
52
52
  - !ruby/object:Gem::Version
53
- version: '0.5'
53
+ version: '0.8'
54
+ - - ">="
55
+ - !ruby/object:Gem::Version
56
+ version: 0.8.1
54
57
  type: :runtime
55
58
  prerelease: false
56
59
  version_requirements: !ruby/object:Gem::Requirement
57
60
  requirements:
58
61
  - - "~>"
59
62
  - !ruby/object:Gem::Version
60
- version: '0.5'
61
- - !ruby/object:Gem::Dependency
62
- name: avm-eac_ubuntu_base0
63
- requirement: !ruby/object:Gem::Requirement
64
- requirements:
65
- - - ">="
66
- - !ruby/object:Gem::Version
67
- version: '0'
68
- type: :development
69
- prerelease: false
70
- version_requirements: !ruby/object:Gem::Requirement
71
- requirements:
63
+ version: '0.8'
72
64
  - - ">="
73
65
  - !ruby/object:Gem::Version
74
- version: '0'
66
+ version: 0.8.1
75
67
  - !ruby/object:Gem::Dependency
76
68
  name: eac_ruby_gem_support
77
69
  requirement: !ruby/object:Gem::Requirement
78
70
  requirements:
79
71
  - - "~>"
80
72
  - !ruby/object:Gem::Version
81
- version: '0.4'
73
+ version: '0.12'
82
74
  type: :development
83
75
  prerelease: false
84
76
  version_requirements: !ruby/object:Gem::Requirement
85
77
  requirements:
86
78
  - - "~>"
87
79
  - !ruby/object:Gem::Version
88
- version: '0.4'
80
+ version: '0.12'
89
81
  description:
90
82
  email:
91
83
  executables: []
@@ -96,15 +88,13 @@ files:
96
88
  - lib/avm/eac_ubuntu_base0/apache.rb
97
89
  - lib/avm/eac_ubuntu_base0/apache/resource.rb
98
90
  - lib/avm/eac_ubuntu_base0/docker_image.rb
99
- - lib/avm/eac_ubuntu_base0/instances.rb
100
91
  - lib/avm/eac_ubuntu_base0/instances/base.rb
101
- - lib/avm/eac_ubuntu_base0/rspec.rb
102
92
  - lib/avm/eac_ubuntu_base0/rspec/ssh_docker_server.rb
103
93
  - lib/avm/eac_ubuntu_base0/runners/base.rb
104
94
  - lib/avm/eac_ubuntu_base0/runners/base/docker.rb
105
95
  - lib/avm/eac_ubuntu_base0/version.rb
106
96
  - template/avm/eac_ubuntu_base0/docker_image/Dockerfile.template
107
- - template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/Dockerfile
97
+ - template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/Dockerfile.template
108
98
  - template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/id_rsa
109
99
  - template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/id_rsa.pub
110
100
  homepage:
@@ -118,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
118
108
  requirements:
119
109
  - - ">="
120
110
  - !ruby/object:Gem::Version
121
- version: '0'
111
+ version: '2.7'
122
112
  required_rubygems_version: !ruby/object:Gem::Requirement
123
113
  requirements:
124
114
  - - ">="
data/lib/avm/eac_ubuntu_base0/instances.rb DELETED
@@ -1,11 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'eac_ruby_utils/core_ext'
4
-
5
- module Avm
6
- module EacUbuntuBase0
7
- module Instances
8
- require_sub __FILE__
9
- end
10
- end
11
- end
data/lib/avm/eac_ubuntu_base0/rspec.rb DELETED
@@ -1,11 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'eac_ruby_utils/core_ext'
4
-
5
- module Avm
6
- module EacUbuntuBase0
7
- module Rspec
8
- require_sub __FILE__
9
- end
10
- end
11
- end