et_full_system 4.0.14 → 5.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +1 -1
  3. data/docker/Dockerfile +8 -9
  4. data/foreman/.env +1 -2
  5. data/foreman/et1.env +0 -1
  6. data/foreman/et3.env +0 -1
  7. data/foreman/et_admin.env +0 -1
  8. data/foreman/et_api.env +0 -1
  9. data/foreman/et_atos.env +0 -1
  10. data/foreman/et_ccd_export.env +0 -1
  11. data/lib/et_full_system/version.rb +1 -1
  12. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2f385f14efd3d049f0de355d790330ad1783d07823db68f3c423764a6940d8ee
4
- data.tar.gz: b81c348050bed38fdde6811f670d409a60ca4019511eb183737850db0bcea785
3
+ metadata.gz: c7265770818c72ed93aed11a39369e9423de3c5c525549fa82b9f291c43df140
4
+ data.tar.gz: d4d8e9ef682b983b3a938c07771b379a30f1cbcf0d8008b9c98f2f9b28d71807
5
5
  SHA512:
6
- metadata.gz: d2bffe137a560dd1263a2d91c75ae76ea2a49927a55995edc3147ec618be405875835cd564c3d0d8a99091282bd03c51c45daf9ba248fc109a332077b70e6184
7
- data.tar.gz: e352244bbc27d5dda04f6304cbdd1b19cd82e55404304b98bbcfc3d4d5e8f0723131aa33434573b5e5dfbfcfd96530a4ddf4f99d93140588a275aa0dbeda4b65
6
+ metadata.gz: d903a2c227310e73b5efb03a1463cc382e6de5a42cc3626830b042b95f6abf8113e98ac6f732fcd967a62a6e85586b9bb0063b34c091dc1ef4ef3e3337f6b3fd
7
+ data.tar.gz: e36236aab3512b6b488b9113184ead15fda63b9815ae5952e2ebc3f0f2d0df253486b0af8a71cafdcb2e61842e951b432d8ef3f17be74b4a5c6ea8b05068a6c8
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- et_full_system (4.0.14)
4
+ et_full_system (5.0.0)
5
5
  aws-sdk-s3 (~> 1.9)
6
6
  azure-storage (~> 0.15.0.preview)
7
7
  dotenv (~> 2.7, >= 2.7.2)
data/docker/Dockerfile CHANGED
@@ -1,8 +1,15 @@
1
+ FROM mailhog/mailhog:v1.0.1 AS mailhog
2
+ FROM traefik:1.7 AS traefik
3
+ FROM minio/minio AS minio
1
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
@@ -41,25 +48,17 @@ RUN gem update --system
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 pdftk wget sudo libmcrypt-dev mcrypt sqlite3 libsqlite3-dev yarn shared-mime-info && rm -rf /var/lib/apt/lists/*
51
+ RUN apt-get update && apt-get -y --no-install-recommends install musl tzdata postgresql gettext-base pdftk wget sudo libmcrypt-dev mcrypt sqlite3 libsqlite3-dev yarn shared-mime-info && rm -rf /var/lib/apt/lists/*
45
52
 
46
53
  # Enable the Redis service.
47
54
  RUN rm -f /etc/service/redis/down
48
55
 
49
56
  # Install freeport
50
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
51
- # Install traefik (For front end reverse proxy)
52
- 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"
53
-
54
- # Install minio
55
- RUN bash -lc "cd /usr/local/bin && wget https://dl.minio.io/server/minio/release/linux-amd64/minio && chmod +x minio"
56
58
 
57
59
  # Install azurite
58
60
  RUN bash -lc "npm install -g azurite@2.7.0"
59
61
 
60
- # Install Mailhog
61
- 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"
62
-
63
62
  # Install go, then godotenv, then remove go
64
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
65
64
 
data/foreman/.env CHANGED
@@ -30,6 +30,5 @@ AZURE_STORAGE_CONTAINER='et-api-test-container'
30
30
  AZURE_STORAGE_DIRECT_UPLOAD_ACCOUNT='devstoreaccount1'
31
31
  AZURE_STORAGE_DIRECT_UPLOAD_ACCESS_KEY='Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=='
32
32
  AZURE_STORAGE_DIRECT_UPLOAD_CONTAINER='et-api-direct-test-container'
33
- AZURE_APP_INSIGHTS_KEY=${AZURE_APP_INSIGHTS_KEY}
34
33
  GOVUK_NOTIFY_CUSTOM_URL=http://notify.et.127.0.0.1.nip.io:3100
35
- GOVUK_NOTIFY_API_KEY_LIVE=fake-key-7fc24bc8-1938-1827-bed3-fb237f9cd5e7-c34b3015-02a1-4e01-b922-1ea21f331d4d
34
+ GOVUK_NOTIFY_API_KEY_LIVE=fake-key-7fc24bc8-1938-1827-bed3-fb237f9cd5e7-c34b3015-02a1-4e01-b922-1ea21f331d4d
data/foreman/et1.env CHANGED
@@ -18,4 +18,3 @@ FLATTEN_PDF=false
18
18
  SIDEKIQ_ALIVE_PORT=7434
19
19
  DISABLE_SIDEKIQ_ALIVE=true
20
20
  SERVICE_NOW_EMAIL=fake@servicenow.fake.com
21
- AZURE_APP_INSIGHTS_ROLE_NAME=et1-fs
data/foreman/et3.env CHANGED
@@ -1,6 +1,5 @@
1
1
  REDIS_URL=redis://redis:6379/5
2
2
  RAVEN_DSN='https://7f2374c2e0cd4650bf5129c9fe45215e:e0ae53d01bd7454da963790ee204ffa0@sentry.io/1376078'
3
3
  ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api'
4
- AZURE_APP_INSIGHTS_ROLE_NAME=et3-fs
5
4
  DB_NAME=et3_production
6
5
  ROOT_URL=http://et3.et.127.0.0.1.nip.io:3100
data/foreman/et_admin.env CHANGED
@@ -6,4 +6,3 @@ SEED_EXAMPLE_USERS='true'
6
6
  S3_UPLOAD_BUCKET='etapibucket'
7
7
  RAVEN_DSN='https://ff44444af15e43a287fa10eb4f3fd825:b5764132fc3a42e98d8a7f8ba3042a90@sentry.io/1389908'
8
8
  ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api'
9
- AZURE_APP_INSIGHTS_ROLE_NAME=et-admin-fs
data/foreman/et_api.env CHANGED
@@ -7,4 +7,3 @@ S3_DIRECT_UPLOAD_BUCKET='etapidirectbucket'
7
7
  RAVEN_DSN='https://929365547a42468fb521248a96100646:139af8327fa340b88088efeae059fca8@sentry.io/1254109'
8
8
  ACAS_SERVICE_URL='http://acas.et.127.0.0.1.nip.io:3100/Lookup/ECService.svc'
9
9
  DISABLE_SIDEKIQ_ALIVE=true
10
- AZURE_APP_INSIGHTS_ROLE_NAME=et-api-fs
data/foreman/et_atos.env CHANGED
@@ -1,4 +1,3 @@
1
1
  S3_UPLOAD_BUCKET='etapibucket'
2
2
  S3_DIRECT_UPLOAD_BUCKET='etapidirectbucket'
3
3
  DB_NAME='et_api_production'
4
- AZURE_APP_INSIGHTS_ROLE_NAME=et-atos-fs
data/foreman/et_ccd_export.env CHANGED
@@ -12,5 +12,4 @@ CCD_MICROSERVICE_ID=${CCD_MICROSERVICE_ID}
12
12
  CCD_MICROSERVICE_SECRET=${CCD_MICROSERVICE_SECRET}
13
13
  DISABLE_SIDEKIQ_ALIVE=true
14
14
  CCD_GENERATE_ETHOS_CASE_REFERENCE=false
15
- AZURE_APP_INSIGHTS_ROLE_NAME=et-ccd-export-fs
16
15
  CCD_DOCUMENT_STORE_URL_REWRITE=false
data/lib/et_full_system/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EtFullSystem
2
- VERSION = "4.0.14"
2
+ VERSION = "5.0.0"
3
3
  end
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.0.14
4
+ version: 5.0.0
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 00:00:00.000000000 Z
11
+ date: 2021-11-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor