avm-eac_ubuntu_base0 0.5.1 → 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 +4 -4
  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 +19 -21
  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: ec3435f15adf03b8951b7a81c4473980c681e94041f80a78bce3dc7d922c38c4
4
- data.tar.gz: e3d06266c308f628f554bf5dc35cffce0f34109bb79298530fd5c510fc1f29d9
3
+ metadata.gz: b1126f033538256d06e61d74b5ef8a45dd51128c202a758baac047250267f388
4
+ data.tar.gz: 6e3f1cd3af156639e72f4051a9a29186049da37951011b54cf88e86627bf3a85
5
5
  SHA512:
6
- metadata.gz: 44a8db54e00039366784fd4fee02606f9578b6936022eb894787f261d3164938c0d915ae7578d415d0fcd363c816452652155eb7075da87a21b8a094bc145d87
7
- data.tar.gz: 7a39ced9a550c850c60e92f5572800af4408fc31ff101dffa9b25253e19ae91016bea43acf4d3027c2400773cfe9ae8c4ec9444d9a3d16b73b8a06a554bf2848
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?
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.1'
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.1
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: 2024-03-05 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,68 +16,68 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.86'
20
- - - ">="
21
- - !ruby/object:Gem::Version
22
- version: 0.86.2
19
+ version: '0.97'
23
20
  type: :runtime
24
21
  prerelease: false
25
22
  version_requirements: !ruby/object:Gem::Requirement
26
23
  requirements:
27
24
  - - "~>"
28
25
  - !ruby/object:Gem::Version
29
- version: '0.86'
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- version: 0.86.2
26
+ version: '0.97'
33
27
  - !ruby/object:Gem::Dependency
34
28
  name: eac_ruby_utils
35
29
  requirement: !ruby/object:Gem::Requirement
36
30
  requirements:
37
31
  - - "~>"
38
32
  - !ruby/object:Gem::Version
39
- version: '0.121'
33
+ version: '0.128'
34
+ - - ">="
35
+ - !ruby/object:Gem::Version
36
+ version: 0.128.3
40
37
  type: :runtime
41
38
  prerelease: false
42
39
  version_requirements: !ruby/object:Gem::Requirement
43
40
  requirements:
44
41
  - - "~>"
45
42
  - !ruby/object:Gem::Version
46
- version: '0.121'
43
+ version: '0.128'
44
+ - - ">="
45
+ - !ruby/object:Gem::Version
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
54
  - - ">="
55
55
  - !ruby/object:Gem::Version
56
- version: 0.5.1
56
+ version: 0.8.1
57
57
  type: :runtime
58
58
  prerelease: false
59
59
  version_requirements: !ruby/object:Gem::Requirement
60
60
  requirements:
61
61
  - - "~>"
62
62
  - !ruby/object:Gem::Version
63
- version: '0.5'
63
+ version: '0.8'
64
64
  - - ">="
65
65
  - !ruby/object:Gem::Version
66
- version: 0.5.1
66
+ version: 0.8.1
67
67
  - !ruby/object:Gem::Dependency
68
68
  name: eac_ruby_gem_support
69
69
  requirement: !ruby/object:Gem::Requirement
70
70
  requirements:
71
71
  - - "~>"
72
72
  - !ruby/object:Gem::Version
73
- version: '0.10'
73
+ version: '0.12'
74
74
  type: :development
75
75
  prerelease: false
76
76
  version_requirements: !ruby/object:Gem::Requirement
77
77
  requirements:
78
78
  - - "~>"
79
79
  - !ruby/object:Gem::Version
80
- version: '0.10'
80
+ version: '0.12'
81
81
  description:
82
82
  email:
83
83
  executables: []
@@ -88,15 +88,13 @@ files:
88
88
  - lib/avm/eac_ubuntu_base0/apache.rb
89
89
  - lib/avm/eac_ubuntu_base0/apache/resource.rb
90
90
  - lib/avm/eac_ubuntu_base0/docker_image.rb
91
- - lib/avm/eac_ubuntu_base0/instances.rb
92
91
  - lib/avm/eac_ubuntu_base0/instances/base.rb
93
- - lib/avm/eac_ubuntu_base0/rspec.rb
94
92
  - lib/avm/eac_ubuntu_base0/rspec/ssh_docker_server.rb
95
93
  - lib/avm/eac_ubuntu_base0/runners/base.rb
96
94
  - lib/avm/eac_ubuntu_base0/runners/base/docker.rb
97
95
  - lib/avm/eac_ubuntu_base0/version.rb
98
96
  - template/avm/eac_ubuntu_base0/docker_image/Dockerfile.template
99
- - template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/Dockerfile
97
+ - template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/Dockerfile.template
100
98
  - template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/id_rsa
101
99
  - template/avm/eac_ubuntu_base0/rspec/ssh_docker_server/id_rsa.pub
102
100
  homepage:
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