avm-eac_redmine_base0 0.18.0 → 0.18.2

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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/lib/avm/eac_redmine_base0/instances/base/database.rb +2 -2
  3. data/lib/avm/eac_redmine_base0/instances/base.rb +4 -1
  4. data/lib/avm/eac_redmine_base0/instances/docker_image.rb +9 -1
  5. data/lib/avm/eac_redmine_base0/instances/runners.rb +1 -0
  6. data/lib/avm/eac_redmine_base0/version.rb +1 -1
  7. data/locale/en.yml +3 -2
  8. data/locale/pt-BR.yml +3 -2
  9. data/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template +0 -4
  10. metadata +26 -15
  11. data/template/avm/eac_redmine_base0/instances/docker_image/install_settings.sh.template +0 -33
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e150411c0e1149e921c4b39883067df8f7303f45c037973a3f49421b062168f8
4
- data.tar.gz: e1d1ba026f78081b784ff8403481996e3b902df4c20d79fe343fce1938595232
3
+ metadata.gz: b9ee700356cc1a169722b6d2fde458d15ff4db2e631511e922d10bf4799d0e56
4
+ data.tar.gz: '08831928259ce9ad89b579bf8d7512143b52149c91acee8a336386d2bfc94546'
5
5
  SHA512:
6
- metadata.gz: b6949e4e977bc022f0bfadedb368cbd87572aef8537b3ac70605a34447ab1589a8f315dac93bf0707369aa02418a39941d2366588962a50ddd961daefa63d50a
7
- data.tar.gz: 54af2eb4429eb191cd8d53411672f0136c9e87c11161beafb4360c5ccd522bb7cfbe97666aceadd6ee0a352709ba45629ece7da055e5831c1eedae03a70d854a
6
+ metadata.gz: 0b5cfcb2f093b265bfcdb8f2382af5301e976bb7c1cc048a8c613b11d23f214cde0432271fb430b5984ab70c40c7f0f808cfabfea2716d653ed62c09b05557ad
7
+ data.tar.gz: a2f56e430271194bccaa50570f86f0c6c94e2f3c75b04479dc4fc603da7fba4d30fac38a97e51c6ee293d70abefdcfdec44c9978996b8639ca07db86a1939436
data/lib/avm/eac_redmine_base0/instances/base/database.rb CHANGED
@@ -8,8 +8,8 @@ module Avm
8
8
  module Instances
9
9
  class Base < ::Avm::EacRailsBase1::Instances::Base
10
10
  module Database
11
- DATABASE_INTERNAL_HOSTNAME = 'localhost'
12
- DEFAULT_POSTGRESQL_VERSION = '12'
11
+ DATABASE_INTERNAL_HOSTNAME = ::Avm::Instances::Base::AutoValues::Database::LOCAL_ADDRESS
12
+ DEFAULT_POSTGRESQL_VERSION = ''
13
13
 
14
14
  common_concern do
15
15
  uri_components_entries_values 'postgresql', %w[version]
data/lib/avm/eac_redmine_base0/instances/base.rb CHANGED
@@ -6,14 +6,17 @@ require 'avm/eac_redmine_base0/instances/docker_image'
6
6
  require 'avm/eac_redmine_base0/instances/runners'
7
7
  require 'avm/eac_redmine_base0/instances/rest_api'
8
8
  require 'avm/eac_rails_base1/instances/base'
9
+ require 'avm/eac_ruby_base1/instances/mixin'
9
10
 
10
11
  module Avm
11
12
  module EacRedmineBase0
12
13
  module Instances
13
14
  class Base < ::Avm::EacRailsBase1::Instances::Base
14
- require_sub __FILE__, include_modules: true
15
+ require_sub __FILE__, include_modules: true, require_dependency: true
15
16
  enable_simple_cache
16
17
 
18
+ include ::Avm::EacRubyBase1::Instances::Mixin
19
+
17
20
  def docker_image_class
18
21
  ::Avm::EacRedmineBase0::Instances::DockerImage
19
22
  end
data/lib/avm/eac_redmine_base0/instances/docker_image.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'eac_ruby_utils/core_ext'
4
+ require 'avm/eac_redmine_base0/instances/deploy'
4
5
  require 'avm/eac_ubuntu_base0/instances/base'
5
6
  require 'avm/instances/docker_image'
6
7
  require 'eac_templates/core_ext'
@@ -11,7 +12,6 @@ module Avm
11
12
  class DockerImage < ::Avm::Instances::DockerImage
12
13
  enable_simple_cache
13
14
 
14
- BASE_IMAGE = 'ubuntu:20.04'
15
15
  INSTALLER_TARGET_TASK_WITH_WEB_PATH_BLANK = 'redmine_as_apache_base'
16
16
  INSTALLER_TARGET_TASK_WITH_WEB_PATH_PRESENT = 'redmine_as_apache_path'
17
17
  REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
@@ -64,6 +64,14 @@ module Avm
64
64
  ::Addressable::URI.parse(instance.web_url).path.present?
65
65
  end
66
66
 
67
+ def write_in_provide_dir
68
+ super
69
+
70
+ ::Avm::EacRedmineBase0::Instances::Deploy.template.child('config')
71
+ .child('install.sh.template')
72
+ .apply_to_file(variables_source, provide_dir.join('install_settings.sh'))
73
+ end
74
+
67
75
  private
68
76
 
69
77
  def eac_ubuntu_base0_instance
data/lib/avm/eac_redmine_base0/instances/runners.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ require 'avm/eac_redmine_base0/instances/deploy'
3
4
  require 'eac_ruby_utils/core_ext'
4
5
 
5
6
  module Avm
data/lib/avm/eac_redmine_base0/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Avm
4
4
  module EacRedmineBase0
5
- VERSION = '0.18.0'
5
+ VERSION = '0.18.2'
6
6
  end
7
7
  end
data/locale/en.yml CHANGED
@@ -1,5 +1,6 @@
1
1
  en:
2
2
  avm:
3
3
  eac_redmine_base0:
4
- core_update:
5
- git_commit_message: "Core: update to '%{version}'."
4
+ sources:
5
+ core_update:
6
+ git_commit_message: "Core: update to '%{version}'."
data/locale/pt-BR.yml CHANGED
@@ -1,5 +1,6 @@
1
1
  pt-BR:
2
2
  avm:
3
3
  eac_redmine_base0:
4
- core_update:
5
- git_commit_message: "Core: atualiza para '%{version}'."
4
+ sources:
5
+ core_update:
6
+ git_commit_message: "Core: atualiza para '%{version}'."
data/template/avm/eac_redmine_base0/instances/docker_image/Dockerfile.template CHANGED
@@ -1,9 +1,5 @@
1
1
  FROM '%%base_image%%'
2
2
  USER root
3
- RUN apt-get update -y
4
- RUN DEBIAN_FRONTEND=noninteractive apt-get install -y sudo tzdata git apt-utils
5
- RUN ln -fs /usr/share/zoneinfo/America/Sao_Paulo /etc/localtime
6
- RUN dpkg-reconfigure --frontend noninteractive tzdata
7
3
 
8
4
  # Redmine / Código-fonte
9
5
  RUN echo '%%redmine_source_git_id%%' '%%redmine_user_home%%/redmine_source_git_id'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: avm-eac_redmine_base0
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.18.0
4
+ version: 0.18.2
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: 2022-12-10 00:00:00.000000000 Z
11
+ date: 2023-03-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: avm
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0.57'
19
+ version: '0.65'
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.57'
26
+ version: '0.65'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: avm-eac_generic_base0
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0.8'
33
+ version: '0.11'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '0.8'
40
+ version: '0.11'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: avm-eac_rails_base1
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -45,6 +45,9 @@ dependencies:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0.8'
48
+ - - ">="
49
+ - !ruby/object:Gem::Version
50
+ version: 0.8.1
48
51
  type: :runtime
49
52
  prerelease: false
50
53
  version_requirements: !ruby/object:Gem::Requirement
@@ -52,20 +55,29 @@ dependencies:
52
55
  - - "~>"
53
56
  - !ruby/object:Gem::Version
54
57
  version: '0.8'
58
+ - - ">="
59
+ - !ruby/object:Gem::Version
60
+ version: 0.8.1
55
61
  - !ruby/object:Gem::Dependency
56
62
  name: avm-eac_ubuntu_base0
57
63
  requirement: !ruby/object:Gem::Requirement
58
64
  requirements:
59
65
  - - "~>"
60
66
  - !ruby/object:Gem::Version
61
- version: '0.3'
67
+ version: '0.4'
68
+ - - ">="
69
+ - !ruby/object:Gem::Version
70
+ version: 0.4.1
62
71
  type: :runtime
63
72
  prerelease: false
64
73
  version_requirements: !ruby/object:Gem::Requirement
65
74
  requirements:
66
75
  - - "~>"
67
76
  - !ruby/object:Gem::Version
68
- version: '0.3'
77
+ version: '0.4'
78
+ - - ">="
79
+ - !ruby/object:Gem::Version
80
+ version: 0.4.1
69
81
  - !ruby/object:Gem::Dependency
70
82
  name: curb
71
83
  requirement: !ruby/object:Gem::Requirement
@@ -106,34 +118,34 @@ dependencies:
106
118
  requirements:
107
119
  - - "~>"
108
120
  - !ruby/object:Gem::Version
109
- version: '0.6'
121
+ version: '0.7'
110
122
  - - ">="
111
123
  - !ruby/object:Gem::Version
112
- version: 0.6.1
124
+ version: 0.7.3
113
125
  type: :runtime
114
126
  prerelease: false
115
127
  version_requirements: !ruby/object:Gem::Requirement
116
128
  requirements:
117
129
  - - "~>"
118
130
  - !ruby/object:Gem::Version
119
- version: '0.6'
131
+ version: '0.7'
120
132
  - - ">="
121
133
  - !ruby/object:Gem::Version
122
- version: 0.6.1
134
+ version: 0.7.3
123
135
  - !ruby/object:Gem::Dependency
124
136
  name: eac_ruby_utils
125
137
  requirement: !ruby/object:Gem::Requirement
126
138
  requirements:
127
139
  - - "~>"
128
140
  - !ruby/object:Gem::Version
129
- version: '0.109'
141
+ version: '0.112'
130
142
  type: :runtime
131
143
  prerelease: false
132
144
  version_requirements: !ruby/object:Gem::Requirement
133
145
  requirements:
134
146
  - - "~>"
135
147
  - !ruby/object:Gem::Version
136
- version: '0.109'
148
+ version: '0.112'
137
149
  - !ruby/object:Gem::Dependency
138
150
  name: eac_ruby_gem_support
139
151
  requirement: !ruby/object:Gem::Requirement
@@ -185,7 +197,6 @@ files:
185
197
  - template/avm/eac_redmine_base0/instances/docker_image/Dockerfile_apache_setup
186
198
  - template/avm/eac_redmine_base0/instances/docker_image/apache_http_virtualhost.conf.template
187
199
  - template/avm/eac_redmine_base0/instances/docker_image/apache_https_virtualhost.conf.template
188
- - template/avm/eac_redmine_base0/instances/docker_image/install_settings.sh.template
189
200
  - template/avm/eac_redmine_base0/instances/docker_image/start.sh.template
190
201
  homepage:
191
202
  licenses: []
data/template/avm/eac_redmine_base0/instances/docker_image/install_settings.sh.template DELETED
@@ -1,33 +0,0 @@
1
- # Database
2
- export postgresql_internal='%%database_internal%%'
3
- export postgresql_host='%%DATABASE.HOSTNAME%%'
4
- export postgresql_port='%%DATABASE.PORT%%'
5
- export postgresql_user='%%DATABASE.USERNAME%%'
6
- export postgresql_password='%%DATABASE.PASSWORD%%'
7
- export postgresql_database='%%DATABASE.NAME%%'
8
- export postgresql_extra_settings='%%DATABASE.EXTRA%%'
9
-
10
- # Git Hosting
11
- export redmine_git_hosting_ssh_key_name=redmine_git_hosting_id
12
- export git_repositories_hierarchical_organisation=false
13
-
14
- # Web
15
- if [ '%%WEB.SCHEME%%' == 'https' ]; then
16
- export address_https='true'
17
- else
18
- export address_https='false'
19
- fi
20
- export address_host='%%WEB.AUTHORITY%%'
21
- export address_path='%%WEB.PATH%%'
22
-
23
- # Mail settings
24
- export smtp_server='%%MAILER.SMTP.ADDRESS%%'
25
- export smtp_port='%%MAILER.SMTP.PORT%%'
26
- export smtp_domain='%%MAILER.SMTP.DOMAIN%%'
27
- export smtp_tls='%%MAILER.SMTP.TLS%%'
28
- export smtp_enable_starttls_auto='%%MAILER.SMTP.STARTTLS_AUTO%%'
29
- export smtp_openssl_verify_mode='%%MAILER.SMTP.OPENSSL_VERIFY_MODE%%'
30
- export smtp_authentication='%%MAILER.SMTP.AUTHENTICATION%%'
31
- export smtp_username='%%MAILER.SMTP.USERNAME%%'
32
- export smtp_password='%%MAILER.SMTP.PASSWORD%%'
33
- export mail_from='%%MAILER.FROM%%'