orchestration 0.4.7 → 0.4.8
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.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/orchestration/environment.rb +8 -1
- data/lib/orchestration/templates/Dockerfile.erb +2 -0
- data/lib/orchestration/templates/database.yml.erb +2 -2
- data/lib/orchestration/templates/orchestration.mk.erb +1 -0
- data/lib/orchestration/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3658b497eae57e7f247ef8f703ddb90ca6c041a2aba5409c61e54291a8e80c22
|
|
4
|
+
data.tar.gz: 4a7a242492fd376b62ccb30c2dbf6e5e9163aa202e5fefbbb75b1fef4eab315c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d855b7c336167af5db5444f96319de4236d7bb19fdb2ad0554b0c1730485ff57f3d1e3e9d8317138fe60797ac4cf4011bf76f168c1e8948ce3e242e0a012d7c6
|
|
7
|
+
data.tar.gz: 98c840d9cdd7272fa2f167373b5df176f9bb0a6d6b22f4be897dd64290f51c17087a20c8f5765e1fdd68890beae7f9de74fdde839441d014d873dfb1effd1996
|
data/README.md
CHANGED
|
@@ -18,7 +18,14 @@ module Orchestration
|
|
|
18
18
|
end
|
|
19
19
|
|
|
20
20
|
def database_url
|
|
21
|
-
|
|
21
|
+
case environment
|
|
22
|
+
when 'development'
|
|
23
|
+
ENV['DEVELOPMENT_DATABASE_URL'] || ENV['DATABASE_URL']
|
|
24
|
+
when 'test'
|
|
25
|
+
ENV['TEST_DATABASE_URL'] || ENV['DATABASE_URL']
|
|
26
|
+
else
|
|
27
|
+
ENV['DATABASE_URL']
|
|
28
|
+
end
|
|
22
29
|
end
|
|
23
30
|
|
|
24
31
|
def mongo_url
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
FROM ruby:<%= ruby_version %>
|
|
2
2
|
ARG BUNDLE_BITBUCKET__ORG
|
|
3
3
|
ARG BUNDLE_GITHUB__COM
|
|
4
|
+
ARG GIT_COMMIT
|
|
4
5
|
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
|
|
5
6
|
&& apt-get update \
|
|
6
7
|
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
|
@@ -23,6 +24,7 @@ RUN . /root/.bashrc && yarn install
|
|
|
23
24
|
<% end %>
|
|
24
25
|
ADD .build/context.tar .
|
|
25
26
|
<% if defined?(Webpacker) %>RUN . /root/.bashrc && NODE_ENV=production RAILS_ENV=production yarn install && NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% elsif Rake::Task.tasks.map(&:name).include?('assets:precompile') %>RUN NODE_ENV=production RAILS_ENV=production SECRET_KEY_BASE=abc123 bundle exec rake assets:precompile<% end %>
|
|
27
|
+
RUN echo "${GIT_COMMIT}" > /app/GIT_COMMIT
|
|
26
28
|
HEALTHCHECK --interval=<%= healthcheck['interval'] %> \
|
|
27
29
|
--timeout=<%= healthcheck['timeout'] %> \
|
|
28
30
|
--start-period=<%= healthcheck['start_period'] %> \
|
|
@@ -21,8 +21,8 @@ test:
|
|
|
21
21
|
database: <%= compose.call(nil).database_adapter.credentials['database'] %>
|
|
22
22
|
# Useful for certain continuous integration environments (e.g. Jenkins in
|
|
23
23
|
# Docker) where the DB hostname may be a service name rather than `127.0.0.1`:
|
|
24
|
-
<%% if ENV.key?('
|
|
25
|
-
url: <%%= ENV['
|
|
24
|
+
<%% if ENV.key?('TEST_DATABASE_URL') %>
|
|
25
|
+
url: <%%= ENV['TEST_DATABASE_URL'] %>
|
|
26
26
|
<%% end %>
|
|
27
27
|
<% end %>
|
|
28
28
|
|
|
@@ -288,6 +288,7 @@ build:
|
|
|
288
288
|
@docker build \
|
|
289
289
|
--build-arg BUNDLE_GITHUB__COM \
|
|
290
290
|
--build-arg BUNDLE_BITBUCKET__ORG \
|
|
291
|
+
--build-arg GIT_COMMIT='${git_version}' \
|
|
291
292
|
-t ${docker_organization}/${docker_repository} \
|
|
292
293
|
-t ${docker_organization}/${docker_repository}:${git_version} \
|
|
293
294
|
${orchestration_dir}/ ${log_progress} || ${fail}
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: orchestration
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Bob Farrell
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-10-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: database_url
|