avm-eac_redmine_base0 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bde6b44c9b45789f145275adf552c902a8501384e9f389b730a848fa4951ef8
-  data.tar.gz: 71a61503c6a7439752fc639816376304747812a656a0b25b27bfb6c494398e0f
+  metadata.gz: 97df75bc9d11dc852876791b5db9e5980dff9ab9530635b59ef19d02a07fab7f
+  data.tar.gz: 82cbadfc771b9e10dee39d5e4cdc5344e0938e9aef7e98d0d0a1a0f9993138e9
 SHA512:
-  metadata.gz: e6bbbde506a2669049707826bec5757b88615e940e398d4e5a9681aec9e3d987d7f7a9eaea34605116d80d3fc143f55c84256caddc456159306b0d601e1b091b
-  data.tar.gz: c4c3c24837c2a82fe54818433ed650aee1e67c529be0b32207f59ad27b2fb85d23e2a2e9b764c6cff5467d2e42becbca6a446500c41c583cd442b71b07416914
+  metadata.gz: a897296cc1a358072d73e24711f7a5d92e697f207797c40ba869b9b8bf99e6ad601fa28239fb875f309410d9b7413674c4fb4c91e635178173a33e146327037c
+  data.tar.gz: c94e64a770e53b17a8747708360165bf9992c8e766bfa7955232e5795131194caa2c130c7aeb40a075c713d42d15f3d55070e931e717e6cfbffe447c34acfe9c

data/lib/avm/eac_redmine_base0/instances/docker_image.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'eac_ruby_utils/core_ext'
+require 'avm/eac_ubuntu_base0/instances/base'
 require 'avm/instances/docker_image'
 require 'avm/eac_redmine_base0/patches/object/template'
 
@@ -10,30 +11,56 @@ module Avm
       class DockerImage < ::Avm::Instances::DockerImage
         enable_simple_cache
 
+        BASE_IMAGE = 'ubuntu:20.04'
+        INSTALLER_TARGET_TASK = 'redmine_as_apache_base'
+        DATABASE_INTERNAL_HOSTNAME = 'localhost'
         REDMINE_SOURCE_HOST_SUBPATH = 'redmine_source'
 
         def avm_fs_cache_object_id
           instance.id
         end
 
+        def base_image
+          eac_ubuntu_base0_instance.docker_image.provide.id
+        end
+
+        def database_internal
+          instance.entry(::Avm::Instances::EntryKeys::DATABASE_HOSTNAME).value ==
+            DATABASE_INTERNAL_HOSTNAME
+        end
+
+        def installer_target_task
+          INSTALLER_TARGET_TASK
+        end
+
         def redmine_user
-          'redmine'
+          eac_ubuntu_base0_instance.docker_image.user_name
         end
 
         def redmine_user_home
-          "/home/#{redmine_user}"
+          eac_ubuntu_base0_instance.docker_image.user_home
         end
 
         def redmine_path
           "#{redmine_user_home}/redmine_app"
         end
 
+        def skip_database
+          ENV['SKIP_DATABASE']
+        end
+
         def start_path
           '/start.sh'
         end
 
         private
 
+        def eac_ubuntu_base0_instance
+          r = ::Avm::EacUbuntuBase0::Instances::Base.by_id(instance.id)
+          r.docker_image_options = instance.docker_image_options
+          r
+        end
+
         def git_repo_uncached
           ::EacGit::Local.new(instance.source_instance.fs_path)
         end

data/lib/avm/eac_redmine_base0/version.rb

@@ -2,6 +2,6 @@
 
 module Avm
   module EacRedmineBase0
-    VERSION = '0.2.2'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avm-eac_redmine_base0
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avm-eac_rails_base1
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: avm-eac_ubuntu_base0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement