wco_models 3.1.0.126 → 3.1.0.128

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a460451e76e84969e808c9e50124456db09abd0948926be42151ea19911cab0
-  data.tar.gz: 9a28142b46f120dfe7e0d6c34a220609d52ca58294643585e6f6908aa09ac87e
+  metadata.gz: 47c3681ac6d5c0c89404e8d0c658a68cee9e86fabf97d89fd50c6be1dc3d7e7f
+  data.tar.gz: dbfe632f6d6517cb9c537adcf4ab6bf1b1811fc3a83414d69b8c2bf186939553
 SHA512:
-  metadata.gz: 01a0263fcfa71456b3d1789e34956436967d71353b3b3e79b39ccb58a1ca0fb174a6834d096daba36580428dfd29d9d224282a387ce585db31e5301e7c09c701
-  data.tar.gz: efa8987c17686a1b737a901117d22fc89fe47b64b3fa15db21dda54f71a63c98919f14f5682adec2b3aa63c78af4d0137e394c5dc90f802b2094e2ca244b0282
+  metadata.gz: 905172496a4162311c73e6a2e86a9fa1cf698941200e061e0f8bf829d1fd613828486caebcb2b1a9e200621da6c7ac78f13b2de264876b7b667d7b01f6424055
+  data.tar.gz: 7808190db66e80b94ee87269c0fcea21d3e69d577179f56e7096a646bc93f98e8cdeb61f9ad4b36817827ff0ea7d1ef13ef925970d59380145cf8ce527c0b78d

data/app/models/wco_hosting/appliance.rb

@@ -16,7 +16,7 @@ class WcoHosting::Appliance
     self[:service_name] = host.gsub(".", "_")
   end
 
-  belongs_to :environment, class_name: 'WcoHosting::Environment', inverse_of: :appliances
+  belongs_to :environment, class_name: 'WcoHosting::Environment', inverse_of: :appliances, optional: true
 
   field :subdomain
   field :domain

data/app/models/wco_hosting/serverhost.rb

@@ -85,7 +85,8 @@ class WcoHosting::Serverhost
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@app, app )
     ac.instance_variable_set( :@workdir, WORKDIR )
-    rendered_str = ac.render_to_string("wco_hosting/docker-compose/dc-#{app.tmpl.kind}")
+    # rendered_str = ac.render_to_string("wco_hosting/docker-compose/dc-#{app.tmpl.kind}")
+    rendered_str = ac.render_to_string("wco_hosting/docker-compose/dc-any")
     Wco::Log.puts! rendered_str, 'add_docker_service rendered_str', obj: @obj
 
     file = Tempfile.new('prefix')

data/app/views/wco_hosting/scripts/create_volume.erb

@@ -1,19 +1,22 @@
 #!/bin/bash
 
+function download { name="$(basename $1)"; curl "$1" > "$name"; }
+export filename="$(basename <%= @app.tmpl.volume_zip %>)"
+
 set -ex
 
 cd <%= @workdir %>
 rm -rf __MACOSX
 
 ## cache/overwrite
-[ ! -e <%= @app.kind %>__prototype.zip ] && curl <%= @app.tmpl.volume_zip %> > <%= @app.kind %>__prototype.zip
-#                                           curl <%= @app.tmpl.volume_zip %> > <%= @app.kind %>__prototype.zip
+[ ! -e $filename ] && curl <%= @app.tmpl.volume_zip %> > $filename
+#                     curl <%= @app.tmpl.volume_zip %> > $filename
 
 ## cache/overwrite
-[ ! -e <%= @app.kind %>__prototype     ] && rm -rf <%= @app.kind %>__prototype && unzip -o <%= @app.kind %>__prototype.zip
-#                                           rm -rf <%= @app.kind %>__prototype && unzip -o <%= @app.kind %>__prototype.zip
+[ ! -e build ] && unzip -o $filename -d build
+# rm -rf build && unzip -o $filename -d build
 
-mv  <%= @app.kind %>__prototype ./volumes/<%= @app.service_name %>_data
+mv  build ./volumes/<%= @app.service_name %>_data
 
 set +ex
 echo ok #create_volume

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.126
+  version: 3.1.0.128
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-05 00:00:00.000000000 Z
+date: 2024-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3