et_full_system 4.0.11 → 5.0.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565de53f94546580054816804d44421b56cd608f158620e37fb5c552ff5ace4f
-  data.tar.gz: 02b24a6188acfd6d8dbd39b98b67756688f3efe1c43d427edd829bdeeb675561
+  metadata.gz: 585ee3f8442abcb442b9ac9d604c586a105190323983361208a3ac7a32caeee8
+  data.tar.gz: a6e0ed0820422cf15b11f3696e241988848c08181891c442b0174028ac291e58
 SHA512:
-  metadata.gz: ec5707f74b7165d3967d74c6ebbc5cc1e390844c9085e7e1f86022d874b010bdac4a60cd22ae86cd3908fde9200d76d193845eb0c7b961f92652c441a7779774
-  data.tar.gz: c390cbc457ff3ba0e42f1deace87ae461493ccfa92f2a866528f87d814bd5e4dece1b0a7ac7f150594415f41d47a258a3a79f19050188319a087c8bf914afd4e
+  metadata.gz: b82e2e3eeb29c07f66e5e37562ca291b126bf998318a372c492f8196a6e0bb4d145cb20c9d44ef515feda039eb63c64ee3d7c7cc66d5609f9f04c9818616c1cd
+  data.tar.gz: 2cbe1871222b1948dc0d03422ba0021180bea1466face08b5ca6597e6f138d2a88495692353229428435f25d8e6b8ee39fc51a45433e87f56c5306b2801b8a10

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.11)
+    et_full_system (5.0.0.pre.rc2)
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -24,8 +24,8 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.525.0)
-    aws-sdk-core (3.122.0)
+    aws-partitions (1.528.0)
+    aws-sdk-core (3.122.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -86,10 +86,12 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
     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-arm64-darwin)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     public_suffix (4.0.6)
     racc (1.6.0)

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,23 @@ 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 +81,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/lib/et_full_system/version.rb

@@ -1,3 +1,3 @@
 module EtFullSystem
-  VERSION = "4.0.11"
+  VERSION = "5.0.0-rc2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 4.0.11
+  version: 5.0.0.pre.rc2
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-08 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: