et_full_system 1.0.0.pre3 → 1.0.0.pre4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/docker/Dockerfile +5 -6
- data/docker/docker-compose.yml +3 -1
- data/et_full_system.gemspec +0 -9
- data/lib/et_full_system/cli/docker.rb +6 -6
- data/lib/et_full_system/version.rb +1 -1
- metadata +3 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 25e282998e031b651773d5fb1cf478c45458dd8e648ba993076d78dde01a00ea
|
4
|
+
data.tar.gz: cf6de6ee6fe4278121f5544cc6bafc598ebbd6ccf0d284d86c81d700a85c8687
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 964fe014d01a680ed7965f574d2eb8d937c15b9f2235c16604cc52f8453455e9dceea54c7b0f241420fb21279befcc96234dcd4313de9887941141b0187217cb
|
7
|
+
data.tar.gz: da591d507ccba7de194b62623faf558f5b8fb5eb1c87973a6d45d40172c6526b9228e573b0fe838b551d16ea7e33285106cf1ce1e287076b47fc830abcef207b
|
data/Gemfile.lock
CHANGED
data/docker/Dockerfile
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
FROM phusion/passenger-customizable:0.9.34
|
2
2
|
# Set correct environment variables.
|
3
3
|
ENV HOME /root
|
4
|
-
|
4
|
+
ARG GEM_VERSION=>0
|
5
5
|
# Use baseimage-docker's init process.
|
6
6
|
CMD ["/sbin/my_init"]
|
7
7
|
|
@@ -68,9 +68,8 @@ RUN /pd_build/nodejs.sh
|
|
68
68
|
# Enable the Redis service.
|
69
69
|
RUN rm -f /etc/service/redis/down
|
70
70
|
|
71
|
-
# Install
|
72
|
-
RUN
|
73
|
-
|
71
|
+
# Install freeport
|
72
|
+
RUN wget https://github.com/phayes/freeport/releases/download/1.0.2/freeport_1.0.2_linux_amd64.deb && dpkg -i freeport_1.0.2_linux_amd64.deb && rm freeport_1.0.2_linux_amd64.deb
|
74
73
|
# Install traefik (For front end reverse proxy)
|
75
74
|
RUN bash -lc "wget https://github.com/containous/traefik/releases/download/v1.7.10/traefik_linux-amd64 && mv ./traefik_linux-amd64 /usr/bin/traefik && chmod +x /usr/bin/traefik"
|
76
75
|
|
@@ -106,10 +105,10 @@ RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/
|
|
106
105
|
USER app
|
107
106
|
|
108
107
|
RUN bash --login -c "rvm --default use 2.5.1"
|
109
|
-
RUN bash --login -c "gem install bundler --version
|
108
|
+
RUN bash --login -c "gem install bundler --version 1.17.3"
|
110
109
|
|
111
110
|
# Install gems required outside of any bundle.
|
112
|
-
RUN bash --login -c "rvm use && gem install dotenv
|
111
|
+
RUN bash --login -c "rvm use && gem install dotenv et_fake_acas_server invoker && gem install et_full_system --version=$GEM_VERSION"
|
113
112
|
|
114
113
|
WORKDIR /home/app/full_system
|
115
114
|
|
data/docker/docker-compose.yml
CHANGED
@@ -1,10 +1,12 @@
|
|
1
1
|
version: '3'
|
2
2
|
services:
|
3
3
|
et:
|
4
|
-
image: 'et_full_system
|
4
|
+
image: 'et_full_system:${GEM_VERSION:-unknown}'
|
5
5
|
build:
|
6
6
|
context: ../
|
7
7
|
dockerfile: docker/Dockerfile
|
8
|
+
args:
|
9
|
+
GEM_VERSION:
|
8
10
|
|
9
11
|
ports:
|
10
12
|
- '${SERVER_PORT:-3100}:${SERVER_PORT:-3100}'
|
data/et_full_system.gemspec
CHANGED
@@ -14,15 +14,6 @@ Gem::Specification.new do |spec|
|
|
14
14
|
spec.homepage = "https://github.com/ministryofjustice/et-full-system"
|
15
15
|
spec.license = "MIT"
|
16
16
|
|
17
|
-
# Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
|
18
|
-
# to allow pushing to a single host or delete this section to allow pushing to any host.
|
19
|
-
if spec.respond_to?(:metadata)
|
20
|
-
spec.metadata["allowed_push_host"] = "http://mygemserver.com"
|
21
|
-
else
|
22
|
-
raise "RubyGems 2.0 or newer is required to protect against " \
|
23
|
-
"public gem pushes."
|
24
|
-
end
|
25
|
-
|
26
17
|
# Specify which files should be added to the gem when it is released.
|
27
18
|
# The `git ls-files -z` loads the files in the RubyGem that have been added into git.
|
28
19
|
spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
|
@@ -22,7 +22,7 @@ module EtFullSystem
|
|
22
22
|
Bundler.with_original_env do
|
23
23
|
gem_root = File.absolute_path('../../..', __dir__)
|
24
24
|
cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup\""
|
25
|
-
compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
|
25
|
+
compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
|
26
26
|
puts compose_cmd
|
27
27
|
exec(compose_cmd)
|
28
28
|
end
|
@@ -32,7 +32,7 @@ module EtFullSystem
|
|
32
32
|
def compose(*args)
|
33
33
|
Bundler.with_original_env do
|
34
34
|
gem_root = File.absolute_path('../../..', __dir__)
|
35
|
-
cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
|
35
|
+
cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
|
36
36
|
puts cmd
|
37
37
|
exec(cmd)
|
38
38
|
end
|
@@ -42,10 +42,10 @@ module EtFullSystem
|
|
42
42
|
def reset
|
43
43
|
Bundler.with_original_env do
|
44
44
|
gem_root = File.absolute_path('../../..', __dir__)
|
45
|
-
cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
|
45
|
+
cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
|
46
46
|
puts cmd
|
47
47
|
next unless system(cmd)
|
48
|
-
cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
|
48
|
+
cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
|
49
49
|
puts cmd
|
50
50
|
next unless system(cmd)
|
51
51
|
self.class.start(['setup'])
|
@@ -57,7 +57,7 @@ module EtFullSystem
|
|
57
57
|
Bundler.with_original_env do
|
58
58
|
gem_root = File.absolute_path('../../..', __dir__)
|
59
59
|
cmd = "/bin/bash --login -c \"et_full_system local update_service_url #{service} #{url}\""
|
60
|
-
compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
|
60
|
+
compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
|
61
61
|
puts compose_cmd
|
62
62
|
exec(compose_cmd)
|
63
63
|
end
|
@@ -73,7 +73,7 @@ module EtFullSystem
|
|
73
73
|
Bundler.with_original_env do
|
74
74
|
gem_root = File.absolute_path('../../..', __dir__)
|
75
75
|
cmd = "/bin/bash --login -c \"et_full_system local service_env #{service}\""
|
76
|
-
compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
|
76
|
+
compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
|
77
77
|
puts compose_cmd
|
78
78
|
exec(compose_cmd)
|
79
79
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: et_full_system
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.0.
|
4
|
+
version: 1.0.0.pre4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gary Taylor
|
@@ -182,8 +182,7 @@ files:
|
|
182
182
|
homepage: https://github.com/ministryofjustice/et-full-system
|
183
183
|
licenses:
|
184
184
|
- MIT
|
185
|
-
metadata:
|
186
|
-
allowed_push_host: http://mygemserver.com
|
185
|
+
metadata: {}
|
187
186
|
post_install_message:
|
188
187
|
rdoc_options: []
|
189
188
|
require_paths:
|
@@ -199,8 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
199
198
|
- !ruby/object:Gem::Version
|
200
199
|
version: 1.3.1
|
201
200
|
requirements: []
|
202
|
-
|
203
|
-
rubygems_version: 2.7.7
|
201
|
+
rubygems_version: 3.0.6
|
204
202
|
signing_key:
|
205
203
|
specification_version: 4
|
206
204
|
summary: Runs the employment tribunals system - all services and background jobs
|