et_full_system 4.0.10 → 5.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56de023d7b3bd4926dc7db620a8287823b827ea9a980898d1d12a153e5694b7c
-  data.tar.gz: 8d0fd4a51a933e5dad14149bd03d074748a5d3ccfbc951f3a4f9fb6c8d1e4355
+  metadata.gz: 592cedd9a3206d96e5b0cd0b4cfc02c3ac8fc38af0127025bf5d421d5a3dc555
+  data.tar.gz: 9d7021f11cafa9a5277ef8681608d7f068fa1837419a1b7c82f5e20adb52ca7a
 SHA512:
-  metadata.gz: d64437ab0501a891eff99b6d6bc28b8e2ee59e192b1d64af2449de5931177c35f7b5b16aecc412c93fc10b1d07ffa6e6f5d219880707c67f8aa1f3bfabc1ed8d
-  data.tar.gz: 759d5d9c9ac26d93ceb076d831ad0698739a8748a04324c5681c60fc3accee461dc9445d81ea4fea7fef45cfce2ca5262fa6a7842bf1e65a2744d41a7b5eac96
+  metadata.gz: 5c6c0e9954e349fa80ae84744e859716ebac8463a277c4a25cbbb5c2fc685aa64693d923765f2c2dca8aa98c837ef492dcc6da316bf5bdfd185314f28d083b4c
+  data.tar.gz: aec2099ae89679fdfd88c2f70ec1a9c56162a574541454b4fa11f72fe135bf240dcfc5bdaf31e0dc34e64c36b09a80da0eeed9067cc69f10ae08047a0f66edc4

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.10)
+    et_full_system (5.0.0.pre.rc1)
       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,8 +1,15 @@
-FROM phusion/passenger-customizable:1.0.12
+FROM mailhog/mailhog:v1.0.1 AS mailhog
+FROM traefik:1.7 AS traefik
+FROM minio/minio AS minio
+FROM phusion/passenger-customizable:1.0.19
+
 # Set correct environment variables.
 ENV HOME /root
 ARG GEM_VERSION=>0
 ARG user_id=1000
+COPY --from=mailhog /usr/local/bin/MailHog /usr/local/bin/mailhog
+COPY --from=traefik /traefik /usr/local/bin/
+COPY --from=minio /opt/bin/minio /usr/local/bin/
 # Use baseimage-docker's init process.
 CMD ["/sbin/my_init"]
 RUN mv /etc/apt/sources.list.d /etc/apt/sources.list.d.bak
@@ -35,54 +42,20 @@ 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 freeport 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
 
-# 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"
-
-# Install minio
-RUN bash -lc "cd /usr/local/bin && wget https://dl.minio.io/server/minio/release/linux-amd64/minio && chmod +x minio"
-
 # Install azurite
 RUN bash -lc "npm install -g azurite@2.7.0"
 
-# Install Mailhog
-RUN bash -lc "cd /usr/local/bin && wget https://github.com/mailhog/MailHog/releases/download/v1.0.0/MailHog_linux_amd64 -O mailhog && chmod +x mailhog"
-
 # Install go, then godotenv, 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/joho/godotenv/cmd/godotenv && apt-get -y remove golang && apt -y autoremove && rm -rf /var/lib/apt/lists/* && cp /home/app/go/bin/godotenv /usr/bin/ && rm -rf /home/app/go
 
@@ -105,11 +78,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.10"
+  VERSION = "5.0.0-rc1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 4.0.10
+  version: 5.0.0.pre.rc1
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -197,9 +197,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: