et_full_system 4.0.11 → 5.0.0.pre.rc2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.ruby-version +1 -1
- data/Gemfile.lock +6 -4
- data/docker/Dockerfile +12 -36
- data/lib/et_full_system/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 585ee3f8442abcb442b9ac9d604c586a105190323983361208a3ac7a32caeee8
|
4
|
+
data.tar.gz: a6e0ed0820422cf15b11f3696e241988848c08181891c442b0174028ac291e58
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b82e2e3eeb29c07f66e5e37562ca291b126bf998318a372c492f8196a6e0bb4d145cb20c9d44ef515feda039eb63c64ee3d7c7cc66d5609f9f04c9818616c1cd
|
7
|
+
data.tar.gz: 2cbe1871222b1948dc0d03422ba0021180bea1466face08b5ca6597e6f138d2a88495692353229428435f25d8e6b8ee39fc51a45433e87f56c5306b2801b8a10
|
data/.ruby-version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
2.7.
|
1
|
+
2.7.4
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
et_full_system (
|
4
|
+
et_full_system (5.0.0.pre.rc2)
|
5
5
|
aws-sdk-s3 (~> 1.9)
|
6
6
|
azure-storage (~> 0.15.0.preview)
|
7
7
|
dotenv (~> 2.7, >= 2.7.2)
|
@@ -24,8 +24,8 @@ GEM
|
|
24
24
|
addressable (2.8.0)
|
25
25
|
public_suffix (>= 2.0.2, < 5.0)
|
26
26
|
aws-eventstream (1.2.0)
|
27
|
-
aws-partitions (1.
|
28
|
-
aws-sdk-core (3.122.
|
27
|
+
aws-partitions (1.528.0)
|
28
|
+
aws-sdk-core (3.122.1)
|
29
29
|
aws-eventstream (~> 1, >= 1.0.2)
|
30
30
|
aws-partitions (~> 1, >= 1.525.0)
|
31
31
|
aws-sigv4 (~> 1.1)
|
@@ -86,10 +86,12 @@ GEM
|
|
86
86
|
mime-types-data (~> 3.2015)
|
87
87
|
mime-types-data (3.2021.0901)
|
88
88
|
mini_mime (1.1.2)
|
89
|
+
mini_portile2 (2.6.1)
|
89
90
|
minitest (5.14.4)
|
90
91
|
multi_xml (0.6.0)
|
91
92
|
multipart-post (2.1.1)
|
92
|
-
nokogiri (1.12.5
|
93
|
+
nokogiri (1.12.5)
|
94
|
+
mini_portile2 (~> 2.6.1)
|
93
95
|
racc (~> 1.4)
|
94
96
|
public_suffix (4.0.6)
|
95
97
|
racc (1.6.0)
|
data/docker/Dockerfile
CHANGED
@@ -1,8 +1,15 @@
|
|
1
|
-
FROM
|
1
|
+
FROM mailhog/mailhog:v1.0.1 AS mailhog
|
2
|
+
FROM traefik:1.7 AS traefik
|
3
|
+
FROM minio/minio AS minio
|
4
|
+
FROM phusion/passenger-customizable:1.0.19
|
5
|
+
|
2
6
|
# Set correct environment variables.
|
3
7
|
ENV HOME /root
|
4
8
|
ARG GEM_VERSION=>0
|
5
9
|
ARG user_id=1000
|
10
|
+
COPY --from=mailhog /usr/local/bin/MailHog /usr/local/bin/mailhog
|
11
|
+
COPY --from=traefik /traefik /usr/local/bin/
|
12
|
+
COPY --from=minio /opt/bin/minio /usr/local/bin/
|
6
13
|
# Use baseimage-docker's init process.
|
7
14
|
CMD ["/sbin/my_init"]
|
8
15
|
RUN mv /etc/apt/sources.list.d /etc/apt/sources.list.d.bak
|
@@ -35,54 +42,23 @@ RUN /pd_build/ruby-2.7.*.sh
|
|
35
42
|
RUN /pd_build/nodejs.sh
|
36
43
|
|
37
44
|
# Get latest rubygems
|
38
|
-
RUN bash --login -c "rvm --default use 2.7.
|
45
|
+
RUN bash --login -c "rvm --default use 2.7.4"
|
39
46
|
RUN gem update --system
|
40
47
|
|
41
48
|
# ...put your own build instructions here...
|
42
49
|
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
|
43
50
|
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
|
44
|
-
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/*
|
45
|
-
|
46
|
-
# Install jvm (small version from adoptopenjdk), grab specific version of pdftk jar file from gitlab
|
47
|
-
RUN mkdir -p /root/pdftk
|
48
|
-
WORKDIR /root/pdftk
|
49
|
-
RUN apt-get update && apt-get install --no-install-recommends -y \
|
50
|
-
unzip \
|
51
|
-
&& 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 \
|
52
|
-
&& mkdir -p /usr/lib/jvm \
|
53
|
-
&& tar --directory=/usr/lib/jvm -xvzf jvm.tar.gz \
|
54
|
-
&& rm jvm.tar.gz \
|
55
|
-
&& ln -s /usr/lib/jvm/jdk8u222-b10-jre/bin/java /etc/alternatives/java \
|
56
|
-
&& ln -s /etc/alternatives/java /usr/bin/java \
|
57
|
-
&& curl --location -o artifacts.zip https://gitlab.com/pdftk-java/pdftk/-/jobs/artifacts/v3.0.7/download?job=gradle \
|
58
|
-
&& unzip artifacts.zip \
|
59
|
-
&& mv build/libs/pdftk-all.jar /usr/local/lib/pdftk.jar \
|
60
|
-
&& rm -rf build artifacts.zip \
|
61
|
-
&& apt-get remove -y unzip \
|
62
|
-
&& apt autoremove -y \
|
63
|
-
&& rm -rf /var/lib/apt/lists/*
|
64
|
-
# pdftk is a 2 line bash script to just call the jar file, put it in the path
|
65
|
-
COPY docker/pdftk /usr/local/bin
|
66
|
-
RUN chmod 0755 /usr/local/bin/pdftk
|
67
|
-
|
51
|
+
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/*
|
68
52
|
|
69
53
|
# Enable the Redis service.
|
70
54
|
RUN rm -f /etc/service/redis/down
|
71
55
|
|
72
56
|
# Install freeport
|
73
57
|
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
|
-
# Install traefik (For front end reverse proxy)
|
75
|
-
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
|
-
|
77
|
-
# Install minio
|
78
|
-
RUN bash -lc "cd /usr/local/bin && wget https://dl.minio.io/server/minio/release/linux-amd64/minio && chmod +x minio"
|
79
58
|
|
80
59
|
# Install azurite
|
81
60
|
RUN bash -lc "npm install -g azurite@2.7.0"
|
82
61
|
|
83
|
-
# Install Mailhog
|
84
|
-
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"
|
85
|
-
|
86
62
|
# Install go, then godotenv, then remove go
|
87
63
|
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
|
88
64
|
|
@@ -105,11 +81,11 @@ WORKDIR /home/app/full_system
|
|
105
81
|
RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
|
106
82
|
USER app
|
107
83
|
|
108
|
-
RUN bash --login -c "rvm --default use 2.7.
|
84
|
+
RUN bash --login -c "rvm --default use 2.7.4"
|
109
85
|
RUN bash --login -c "gem install bundler --version 1.17.3"
|
110
86
|
|
111
87
|
# Install gems required outside of any bundle.
|
112
|
-
RUN bash --login -c "rvm use && gem install dotenv et_fake_acas_server invoker && gem install et_full_system --version=$GEM_VERSION"
|
88
|
+
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"
|
113
89
|
|
114
90
|
WORKDIR /home/app/full_system
|
115
91
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: et_full_system
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 5.0.0.pre.rc2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Gary Taylor
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-11-
|
11
|
+
date: 2021-11-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|
@@ -197,9 +197,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
197
197
|
version: '0'
|
198
198
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
199
199
|
requirements:
|
200
|
-
- - "
|
200
|
+
- - ">"
|
201
201
|
- !ruby/object:Gem::Version
|
202
|
-
version:
|
202
|
+
version: 1.3.1
|
203
203
|
requirements: []
|
204
204
|
rubygems_version: 3.1.6
|
205
205
|
signing_key:
|