et_full_system 1.0.0.pre3 → 1.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14727240b7137a03f34f02ff52ce2d16a79c89604a3b3b95b3c4976cafd86364
-  data.tar.gz: 7fbcc3cef8960fcbbcd285ae08424b9b4c7aeb96707876a68f2bd124ae55a6ff
+  metadata.gz: 25e282998e031b651773d5fb1cf478c45458dd8e648ba993076d78dde01a00ea
+  data.tar.gz: cf6de6ee6fe4278121f5544cc6bafc598ebbd6ccf0d284d86c81d700a85c8687
 SHA512:
-  metadata.gz: 413933f54ea9628e719987554a77393ca68f7aa94a4f42f49cdf6eea30a4c94cbfaa8d8edbff43d8e71e51f1711f159ff179953b169633a7bd595ab60b5c2d17
-  data.tar.gz: 94c2ae646221b60bd7279069fae776b8e047a7c130d8d46ce812f7c2601d04b6c9a75286716eaf619bf491d0feb783bbb77c58922da3431705743b24df5a271f
+  metadata.gz: 964fe014d01a680ed7965f574d2eb8d937c15b9f2235c16604cc52f8453455e9dceea54c7b0f241420fb21279befcc96234dcd4313de9887941141b0187217cb
+  data.tar.gz: da591d507ccba7de194b62623faf558f5b8fb5eb1c87973a6d45d40172c6526b9228e573b0fe838b551d16ea7e33285106cf1ce1e287076b47fc830abcef207b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (1.0.0.pre3)
+    et_full_system (1.0.0.pre4)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)

data/docker/Dockerfile

@@ -1,7 +1,7 @@
 FROM phusion/passenger-customizable:0.9.34
 # Set correct environment variables.
 ENV HOME /root
-
+ARG GEM_VERSION=>0
 # Use baseimage-docker's init process.
 CMD ["/sbin/my_init"]
 
@@ -68,9 +68,8 @@ RUN /pd_build/nodejs.sh
 # Enable the Redis service.
 RUN rm -f /etc/service/redis/down
 
-# Install go, then freeport, then remove go
-RUN apt-get update && apt-get -y install --no-install-recommends golang && export GOPATH=/home/app/go && mkdir -p /home/app/go && go get github.com/phayes/freeport && apt-get -y remove golang && apt -y autoremove && rm -rf /var/lib/apt/lists/* && cp /home/app/go/bin/freeport /usr/bin/ && rm -rf /home/app/go
-
+# Install freeport
+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
 # Install traefik (For front end reverse proxy)
 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"
 
@@ -106,10 +105,10 @@ RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/
 USER app
 
 RUN bash --login -c "rvm --default use 2.5.1"
-RUN bash --login -c "gem install bundler --version 2.0.2"
+RUN bash --login -c "gem install bundler --version 1.17.3"
 
 # Install gems required outside of any bundle.
-RUN bash --login -c "rvm use && gem install dotenv et_full_system et_fake_acas_server invoker"
+RUN bash --login -c "rvm use && gem install dotenv et_fake_acas_server invoker && gem install et_full_system --version=$GEM_VERSION"
 
 WORKDIR /home/app/full_system
 

data/docker/docker-compose.yml

@@ -1,10 +1,12 @@
 version: '3'
 services:
   et:
-    image: 'et_full_system:0.1.57'
+    image: 'et_full_system:${GEM_VERSION:-unknown}'
     build:
       context: ../
       dockerfile: docker/Dockerfile
+      args:
+        GEM_VERSION:
 
     ports:
       - '${SERVER_PORT:-3100}:${SERVER_PORT:-3100}'

data/et_full_system.gemspec

@@ -14,15 +14,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/ministryofjustice/et-full-system"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "http://mygemserver.com"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do

data/lib/et_full_system/cli/docker.rb

@@ -22,7 +22,7 @@ module EtFullSystem
       Bundler.with_original_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"cd /home/app/full_system && et_full_system docker bootstrap && et_full_system local setup\""
-        compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
+        compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml run --rm et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)
       end
@@ -32,7 +32,7 @@ module EtFullSystem
     def compose(*args)
       Bundler.with_original_env do
         gem_root = File.absolute_path('../../..', __dir__)
-        cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
+        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml #{args.join(' ')}"
         puts cmd
         exec(cmd)
       end
@@ -42,10 +42,10 @@ module EtFullSystem
     def reset
       Bundler.with_original_env do
         gem_root = File.absolute_path('../../..', __dir__)
-        cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
+        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml down -v"
         puts cmd
         next unless system(cmd)
-        cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
+        cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml build --no-cache"
         puts cmd
         next unless system(cmd)
         self.class.start(['setup'])
@@ -57,7 +57,7 @@ module EtFullSystem
       Bundler.with_original_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"et_full_system local update_service_url #{service} #{url}\""
-        compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
+        compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)
       end
@@ -73,7 +73,7 @@ module EtFullSystem
       Bundler.with_original_env do
         gem_root = File.absolute_path('../../..', __dir__)
         cmd = "/bin/bash --login -c \"et_full_system local service_env #{service}\""
-        compose_cmd = "docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
+        compose_cmd = "GEM_VERSION=#{EtFullSystem::VERSION} docker-compose -f #{gem_root}/docker/docker-compose.yml exec et #{cmd}"
         puts compose_cmd
         exec(compose_cmd)
       end

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "1.0.0.pre3"
+  VERSION = "1.0.0.pre4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.pre4
 platform: ruby
 authors:
 - Gary Taylor
@@ -182,8 +182,7 @@ files:
 homepage: https://github.com/ministryofjustice/et-full-system
 licenses:
 - MIT
-metadata:
-  allowed_push_host: http://mygemserver.com
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -199,8 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Runs the employment tribunals system - all services and background jobs