et_full_system 4.0.9 → 4.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b04a8d74d8676ba65981479f69352948358b3c6e2a8221b21f5d228375daad78
-  data.tar.gz: cc3041088e2152ae0f7199c5ec4681b3ce76905c975b36e8db75f58417d21dae
+  metadata.gz: 2f385f14efd3d049f0de355d790330ad1783d07823db68f3c423764a6940d8ee
+  data.tar.gz: b81c348050bed38fdde6811f670d409a60ca4019511eb183737850db0bcea785
 SHA512:
-  metadata.gz: dfa945931d70a482b2117abdb7c55ad2b8f93c990782d2c5e14891ce561576da72e4b35f51d2e21e435c4f14c2ad93d9186a7547145b8468ca463e2e119e9dc0
-  data.tar.gz: 134dfdcbd47750c9c50762a77a1ce7f549c2630b060c33ab36a6f6608cd78e5040b8715cde6ae8965633a1c73dc3d5ccdb12f515c97c7dbe8ed9c407f7058d17
+  metadata.gz: d2bffe137a560dd1263a2d91c75ae76ea2a49927a55995edc3147ec618be405875835cd564c3d0d8a99091282bd03c51c45daf9ba248fc109a332077b70e6184
+  data.tar.gz: e352244bbc27d5dda04f6304cbdd1b19cd82e55404304b98bbcfc3d4d5e8f0723131aa33434573b5e5dfbfcfd96530a4ddf4f99d93140588a275aa0dbeda4b65

data/.ruby-version

@@ -1 +1 @@
-2.7.3
+2.7.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    et_full_system (4.0.9)
+    et_full_system (4.0.14)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -24,17 +24,17 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.509.0)
-    aws-sdk-core (3.121.1)
+    aws-partitions (1.528.0)
+    aws-sdk-core (3.122.1)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-kms (1.51.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.105.1)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -73,36 +73,38 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     iodine (0.7.44)
     jmespath (1.4.0)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.2.3)
+    jwt (2.3.0)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
-    mini_mime (1.1.1)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
     minitest (5.14.4)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rake (13.0.1)
-    roda (3.48.0)
+    roda (3.49.0)
       rack
     rotp (6.2.0)
     thor (1.1.0)
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby

data/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM phusion/passenger-customizable:1.0.12
+FROM phusion/passenger-customizable:1.0.19
 # Set correct environment variables.
 ENV HOME /root
 ARG GEM_VERSION=>0
@@ -35,36 +35,13 @@ RUN /pd_build/ruby-2.7.*.sh
 RUN /pd_build/nodejs.sh
 
 # Get latest rubygems
-RUN bash --login -c "rvm --default use 2.7.2"
+RUN bash --login -c "rvm --default use 2.7.4"
 RUN gem update --system
 
 # ...put your own build instructions here...
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
     echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN apt-get update && apt-get -y --no-install-recommends install tzdata postgresql gettext-base wget sudo libmcrypt-dev mcrypt sqlite3 libsqlite3-dev yarn shared-mime-info && rm -rf /var/lib/apt/lists/*
-
-# Install jvm (small version from adoptopenjdk), grab specific version of pdftk jar file from gitlab
-RUN mkdir -p /root/pdftk
-WORKDIR /root/pdftk
-RUN apt-get update && apt-get install --no-install-recommends -y \
-    unzip \
-    && curl --location -o jvm.tar.gz https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u222-b10_openj9-0.15.1/OpenJDK8U-jre_x64_linux_openj9_8u222b10_openj9-0.15.1.tar.gz \
-    && mkdir -p /usr/lib/jvm \
-    && tar --directory=/usr/lib/jvm -xvzf jvm.tar.gz \
-    && rm jvm.tar.gz \
-    && ln -s /usr/lib/jvm/jdk8u222-b10-jre/bin/java /etc/alternatives/java \
-    && ln -s /etc/alternatives/java /usr/bin/java \
-    && curl --location -o artifacts.zip https://gitlab.com/pdftk-java/pdftk/-/jobs/artifacts/v3.0.7/download?job=gradle \
-    && unzip artifacts.zip \
-    && mv build/libs/pdftk-all.jar /usr/local/lib/pdftk.jar \
-    && rm -rf build artifacts.zip \
-    && apt-get remove -y unzip \
-    && apt autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
-# pdftk is a 2 line bash script to just call the jar file, put it in the path
-COPY docker/pdftk /usr/local/bin
-RUN chmod 0755 /usr/local/bin/pdftk
-
+RUN apt-get update && apt-get -y --no-install-recommends install tzdata postgresql gettext-base pdftk wget sudo libmcrypt-dev mcrypt sqlite3 libsqlite3-dev yarn shared-mime-info && rm -rf /var/lib/apt/lists/*
 
 # Enable the Redis service.
 RUN rm -f /etc/service/redis/down
@@ -105,11 +82,11 @@ WORKDIR /home/app/full_system
 RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
 USER app
 
-RUN bash --login -c "rvm --default use 2.7.2"
+RUN bash --login -c "rvm --default use 2.7.4"
 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_fake_acas_server invoker && gem install et_full_system --version=$GEM_VERSION"
+RUN bash --login -c "rvm use 2.7.4 && 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

@@ -111,6 +111,8 @@ services:
       - et_full_system
     extra_hosts:
       - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
+    profiles:
+      - test
   chrome:
     image: selenium/node-chrome:3.141.59-yttrium
     volumes:
@@ -124,6 +126,9 @@ services:
       - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
     networks:
       - et_full_system
+    profiles:
+      - test
+      - chrome
   firefox:
     image: selenium/node-firefox:3.141.59-yttrium
     volumes:
@@ -137,6 +142,9 @@ services:
       - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP:-127.255.255.255}"
     networks:
       - et_full_system
+    profiles:
+      - test
+      - firefox
 volumes:
   rvm:
   global_node_modules:

data/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "4.0.9"
+  VERSION = "4.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 4.0.9
+  version: 4.0.14
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor