linchpin 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94ff5852860774f64862eae2a8e3aa591410a4af77f7b1d9f2f9d8dced3b83ec
-  data.tar.gz: 57a75927a1157105b139d95d2bf94add3af6cdfe78a9a7cd7cd216ff8471c33a
+  metadata.gz: 726a3e18669c9834aa2614b269f656e4c120cc754ddfff6aaeabc38498181e50
+  data.tar.gz: 6cf127bfadb9650e74289e62b87d71af7bbf58cc8fda097c06ffe0c6fd942d19
 SHA512:
-  metadata.gz: acff1afc859c36e291778041905f7200104855c6cef3313c5fe4f888b6d7b06bc92d93467a63714882c61592c49ff4857ec9359aeec6544698c3cb6e9b64ae99
-  data.tar.gz: bb2485e8fc9501645bb94b2aea9645cd60186d39b22c223bbe4fd7bd9c60cbbd9694ee9b454e72b6038c6ac08c7d11a8240210072e1e1ce1aaa06a23b6684e07
+  metadata.gz: ad9ec24c7ed913b20587b25186f2382663ae4a9e840186f1004da5f3418cd2c83fbd6b83a41663bbd69ad4be313cdaf5ac8c95167533026085a1aee15c6cafdd
+  data.tar.gz: 581316ac677c7c74b6129b7e29ef0c48da386eaea2a3dff295acd5e59766245ee64bb02dfac12338bbea003825b2faccc656394cfe45ee442452f56770d85e10

data/lib/linchpin/cli.rb

@@ -78,23 +78,23 @@ class LinchpinCLI < Thor
   def build_dotnet(app_name, version)
     entry_dir = ''
     Find.find('./') do |path|
-      if path =~ /.*Program\.cs$/ and !path.include? 'common' and !path.include? 'obj'
+      if path =~ /.*Program\.cs$/ and !path.include? 'common' and !path.include? 'obj' and path.include? 'API'
         puts "Found #{path}"
         entry_dir = File.dirname(path)
       end
     end
 
-    entry_dll = ''
+    entry_project = ''
     Find.find(entry_dir) do |path|
       if path =~ /.*\.csproj$/
-        entry_dll = "#{File.basename(path, ".csproj")}.dll"
+        entry_project = File.basename(path, ".csproj")
       end
     end
 
 
     file = Tempfile.new('Dockerfile')
     dockerfile = file.path
-    file.write(Linchpin::Templater.new(entry_dll).render)
+    file.write(Linchpin::Templater.new(entry_project).render)
     file.rewind # => "hello world"
     file.close
 

data/lib/linchpin/dockerfiles/dotnet-Dockerfile.erb

@@ -6,24 +6,16 @@ FROM microsoft/dotnet:2.2.100-sdk AS build
 WORKDIR /src
 COPY . .
 RUN ls -la
-# WORKDIR /src/Catalog.API
 RUN dotnet restore -nowarn:msb3202,nu1503
-# RUN dotnet build --no-restore -c Release -o /app
 RUN dotnet build --no-restore -c Release
 
-FROM build as unittest
-WORKDIR /src/Catalog.UnitTests
-
-FROM build as functionaltest
-WORKDIR /src/Catalog.FunctionalTests
-
 FROM build AS publish
 RUN dotnet publish --no-restore -c Release -o bin/deploy
 
 FROM base AS final
 RUN curl -s https://raw.githubusercontent.com/envkey/envkey-source/master/install.sh | bash
 WORKDIR /app
-COPY --from=publish /src/Catalog.API/bin/deploy .
+COPY --from=publish /src/<%= @entry_project %>/bin/deploy .
 RUN mkdir -p /opt/appdynamics/dotnet
 ADD appd/libappdprofiler.so /opt/appdynamics/dotnet/
 ADD appd/AppDynamics.Agent.netstandard.dll /opt/appdynamics/dotnet/
@@ -31,4 +23,4 @@ ADD appd/AppDynamics.Agent.netstandard.dll /opt/appdynamics/dotnet/
 ENV CORECLR_PROFILER={57e1aa68-2229-41aa-9931-a6e93bbc64d8} \
 CORECLR_ENABLE_PROFILING=1 \
 CORECLR_PROFILER_PATH=/opt/appdynamics/dotnet/libappdprofiler.so
-CMD eval $(envkey-source) && dotnet <%= @entry_dll %>
+CMD eval $(envkey-source) && dotnet <%= @entry_project %>.dll

data/lib/linchpin/templater.rb

@@ -5,8 +5,8 @@ module Linchpin
   class Templater
     include ERB::Util
 
-    def initialize(entry_dll)
-      @entry_dll = entry_dll
+    def initialize(entry_project)
+      @entry_project = entry_project
       @template_loc = File.join(File.join(File.dirname(File.expand_path(__FILE__)), 'dockerfiles'),'dotnet-Dockerfile.erb')
     end
 

data/lib/linchpin/version.rb

@@ -1,3 +1,3 @@
 module Linchpin
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: linchpin
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Paul Everton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor