et_full_system 5.0.0.pre.rc2 → 6.0.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 585ee3f8442abcb442b9ac9d604c586a105190323983361208a3ac7a32caeee8
-  data.tar.gz: a6e0ed0820422cf15b11f3696e241988848c08181891c442b0174028ac291e58
+  metadata.gz: f9938ca7a4fb5777a7c1d84f38686eb524e5cc4eb21e1896249c95fe56e30960
+  data.tar.gz: ef38d8dd6b4a348f195d9c970a492600b79e745f7a05fddef8b06485a7b3a5a7
 SHA512:
-  metadata.gz: b82e2e3eeb29c07f66e5e37562ca291b126bf998318a372c492f8196a6e0bb4d145cb20c9d44ef515feda039eb63c64ee3d7c7cc66d5609f9f04c9818616c1cd
-  data.tar.gz: 2cbe1871222b1948dc0d03422ba0021180bea1466face08b5ca6597e6f138d2a88495692353229428435f25d8e6b8ee39fc51a45433e87f56c5306b2801b8a10
+  metadata.gz: be4d00131a75d8dfca1a5a40180a448bf5f30a6fbe54ca574523bba94e562375fe701633b99a66eaec4bd8508e8a46d38078a5bc6f5bcf6c635970fdf73aa610
+  data.tar.gz: be9b4677aea82538251918ffc8c92ee104768c50796d3ccba8b1a93a80654e716917054bf5703a9a136089df35f553dde0c1dd7507bb859c1394b4f9d1938b31

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    et_full_system (5.0.0.pre.rc2)
+    et_full_system (6.0.0.pre.rc2)
+
       aws-sdk-s3 (~> 1.9)
       azure-storage (~> 0.15.0.preview)
       dotenv (~> 2.7, >= 2.7.2)
@@ -24,7 +25,7 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.528.0)
+    aws-partitions (1.530.0)
     aws-sdk-core (3.122.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -50,11 +51,12 @@ GEM
       nokogiri (~> 1.6, >= 1.6.8)
     concurrent-ruby (1.1.9)
     dotenv (2.7.6)
-    et_fake_ccd (1.1.9)
+    et_fake_ccd (1.1.10)
       activemodel (>= 5.2.3)
       iodine (~> 0.7)
       json-schema (~> 2.5)
       roda (~> 3.21)
+      roda-enhanced_logger (~> 0.4.0)
       rotp (~> 6.2)
       thor (~> 1.0)
       tilt (~> 2.0, >= 2.0.9)
@@ -82,9 +84,9 @@ GEM
     jwt (2.3.0)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2021.1115)
     mini_mime (1.1.2)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
@@ -93,15 +95,23 @@ GEM
     nokogiri (1.12.5)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     public_suffix (4.0.6)
     racc (1.6.0)
     rack (2.2.3)
     rake (13.0.1)
-    roda (3.49.0)
+    roda (3.50.0)
       rack
+    roda-enhanced_logger (0.4.0)
+      roda (>= 3.19.0)
+      tty-logger (>= 0.3, < 1.0)
     rotp (6.2.0)
     thor (1.1.0)
     tilt (2.0.10)
+    tty-color (0.6.0)
+    tty-logger (0.6.0)
+      pastel (~> 0.8)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     zeitwerk (2.5.1)

data/docker/Dockerfile

@@ -1,93 +1,37 @@
-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
-
+FROM ruby:2.7.4-alpine
 # 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
-RUN apt update && apt install -y ca-certificates
-RUN mv /etc/apt/sources.list.d.bak /etc/apt/sources.list.d
-RUN apt-get update
-# If you're using the 'customizable' variant, you need to explicitly opt-in
-# for features.
-#
-# N.B. these images are based on https://github.com/phusion/baseimage-docker,
-# so anything it provides is also automatically on board in the images below
-# (e.g. older versions of Ruby, Node, Python).
-#
-# Uncomment the features you want:
-#
-#   Ruby support
-
-
-#RUN /pd_build/ruby-2.0.*.sh
-#RUN /pd_build/ruby-2.1.*.sh
-#RUN /pd_build/ruby-2.2.*.sh
-#RUN /pd_build/ruby-2.3.*.sh
-#RUN /pd_build/ruby-2.4.*.sh
-RUN /pd_build/ruby-2.7.*.sh
-#RUN /pd_build/jruby-9.1.*.sh
-#   Python support.
-#RUN /pd_build/python.sh
-#   Node.js and Meteor standalone support.
-#   (not needed if you already have the above Ruby support)
-RUN /pd_build/nodejs.sh
-
 # Get latest rubygems
-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 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 azurite
-RUN bash -lc "npm install -g azurite@2.7.0"
-
-# 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
-
-# Create the minio_data directory for the minio server
-RUN mkdir -p /home/app/minio_data; chown app:app /home/app/minio_data; chmod 0777 /home/app/minio_data
-
-# Create the azure_storage_data directory for the azure storage server
-RUN mkdir -p /home/app/azure_storage_data; chown app:app /home/app/azure_storage_data; chmod 0777 /home/app/azure_storage_data
-
-# Clean up APT when done.
-RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
+RUN apk add --no-cache postgresql-dev libffi-dev tzdata gettext wget sudo libmcrypt-dev sqlite sqlite-dev nodejs yarn shared-mime-info git build-base curl bash openjdk11-jre
+RUN addgroup app --gid 1000
+RUN adduser -SD -u 1000 --shell /bin/bash --home /home/app app app
+RUN chown -R app:app /usr/local/bundle
 RUN mkdir -p /home/app/full_system; chown app:app /home/app/full_system
+RUN wget https://gitlab.com/pdftk-java/pdftk/-/jobs/1507074845/artifacts/raw/build/libs/pdftk-all.jar
+RUN mv pdftk-all.jar usr/lib/pdftk.jar
+COPY docker/build/pdftk /usr/local/bin/pdftk
+COPY docker/build/run /home/app/run
+
 # Install gems and binstubs to run without bundler
 RUN mkdir -p /home/app/system_gems/et_full_system && chmod 0777 /home/app/system_gems/et_full_system && chown -R app:app /home/app/system_gems
 
-RUN usermod -o -u $user_id app
-RUN groupmod -o -g $user_id app
+#RUN usermod -o -u $user_id app
+#RUN groupmod -o -g $user_id app
 WORKDIR /home/app/full_system
-RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
+#RUN echo "app ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/user && chmod 0440 /etc/sudoers.d/user
 USER app
+RUN gem install dotenv bundler:1.17.3 invoker
+CMD /home/app/run
 
-RUN bash --login -c "rvm --default use 2.7.4"
-RUN bash --login -c "gem install bundler --version 1.17.3"
+#RUN bash --login -c "gem install bundler --version 1.17.3"
 
 # Install gems required outside of any bundle.
-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"
+#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
+#WORKDIR /home/app/full_system
 
-RUN cd /home/app
-ENV HOME /home/app
+#RUN cd /home/app
+#ENV HOME /home/app

data/docker/build/pdftk

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+java -jar /usr/lib/pdftk.jar "$@"

data/docker/build/run

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+cd /home/app/full_system/systems/et1 && bundle && bundle exec rails db:create db:migrate && \
+cd /home/app/full_system/systems/et3 && bundle && bundle exec rails db:create db:migrate && \
+cd /home/app/full_system/systems/api && bundle && bundle exec rails db:create db:migrate db:seed && \
+cd /home/app/full_system/systems/admin && bundle && bundle exec rails db:seed && \
+cd /home/app/full_system/systems/atos && bundle && \
+cd /home/app/full_system/systems/et_ccd_export && bundle && \
+sleep 60
+

data/docker/docker-compose.yml

@@ -1,5 +1,20 @@
 version: '3'
 services:
+  traefik:
+    # The official v2 Traefik docker image
+    image: traefik:v2.5
+    # Enables the web UI and tells Traefik to listen to docker
+    command: --api.insecure=true --providers.docker
+    ports:
+      # The HTTP port
+      - "80:80"
+      # The Web UI (enabled by --api.insecure=true)
+      - "8080:8080"
+    volumes:
+      # So that Traefik can listen to the Docker events
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - et_full_system
   et:
     image: 'et_full_system:1.0.0.pre'
     build:
@@ -67,7 +82,7 @@ services:
       CCD_MICROSERVICE_SECRET: ${CCD_MICROSERVICE_SECRET:-AAAAAAAAAAAAAAAC}
       CCD_SIDAM_USERNAME: ${CCD_SIDAM_USERNAME:-m@m.com}
       CCD_SIDAM_PASSWORD: ${CCD_SIDAM_PASSWORD:-p}
-    command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --azurite-storage-path=/home/app/azure_storage_data --minio-storage-path=/home/app/minio_data ${SERVER_ARGS}"
+    command: /bin/bash --login -c "cd /home/app/full_system && et_full_system local server --in-docker-compose ${SERVER_ARGS}"
     links:
       - "db"
       - "redis"
@@ -84,6 +99,31 @@ services:
           - atos.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - mail.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
           - ccd.${SERVER_DOMAIN:-et.127.0.0.1.nip.io}
+    labels:
+      - traefik.http.routers.et1-router.rule=Host(`et1.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.et1-router.service=et1-service
+      - traefik.http.services.et1-service.loadbalancer.server.port=4000
+      - traefik.http.routers.et3-router.rule=Host(`et3.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.et3-router.service=et3-service
+      - traefik.http.services.et3-service.loadbalancer.server.port=4001
+      - traefik.http.routers.api-router.rule=Host(`api.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.api-router.service=api-service
+      - traefik.http.services.api-service.loadbalancer.server.port=4002
+      - traefik.http.routers.admin-router.rule=Host(`admin.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.admin-router.service=api-service
+      - traefik.http.services.admin-service.loadbalancer.server.port=4003
+      - traefik.http.routers.atos-router.rule=Host(`atos.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.atos-router.service=api-service
+      - traefik.http.services.atos-service.loadbalancer.server.port=4004
+      - traefik.http.routers.acas-router.rule=Host(`acas.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.acas-router.service=api-service
+      - traefik.http.services.acas-service.loadbalancer.server.port=4005
+      - traefik.http.routers.ccd-router.rule=Host(`ccd.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.ccd-router.service=api-service
+      - traefik.http.services.ccd-service.loadbalancer.server.port=4006
+      - traefik.http.routers.notify-router.rule=Host(`notify.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.notify-router.service=api-service
+      - traefik.http.services.notify-service.loadbalancer.server.port=4007
 
 #command: bash -lc "cd /home/app/full_system/systems/api && REDIS_DATABASE=2 bundle exec sidekiq"
   db:
@@ -102,49 +142,30 @@ services:
       - et_full_system
     volumes:
       - redis_data:/data
-  selenium-hub:
-    image: selenium/hub:3.141.59-yttrium
-    container_name: selenium-hub
-    ports:
-      - "4444:4444"
+  minio:
+    image: minio/minio
+    labels:
+      - traefik.http.routers.s3-router.rule=Host(`s3.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.s3-router.service=et1-service
+      - traefik.http.services.s3-service.loadbalancer.server.port=9000
     networks:
       - et_full_system
-    extra_hosts:
-      - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
-    profiles:
-      - test
-  chrome:
-    image: selenium/node-chrome:3.141.59-yttrium
-    volumes:
-      - /dev/shm:/dev/shm
-    depends_on:
-      - selenium-hub
-    environment:
-      - HUB_HOST=selenium-hub
-      - HUB_PORT=4444
-    extra_hosts:
-      - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP}"
+  mailhog:
+    image: mailhog/mailhog:v1.0.1
+    labels:
+      - traefik.http.routers.mail-router.rule=Host(`mail.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.mail-router.service=et1-service
+      - traefik.http.services.mail-service.loadbalancer.server.port=8025
     networks:
       - et_full_system
-    profiles:
-      - test
-      - chrome
-  firefox:
-    image: selenium/node-firefox:3.141.59-yttrium
-    volumes:
-      - /dev/shm:/dev/shm
-    depends_on:
-      - selenium-hub
-    environment:
-      - HUB_HOST=selenium-hub
-      - HUB_PORT=4444
-    extra_hosts:
-      - "localhost.from.docker:${LOCALHOST_FROM_DOCKER_IP:-127.255.255.255}"
+  azurite:
+    image: mcr.microsoft.com/azure-storage/azurite
+    labels:
+      - traefik.http.routers.azurite-router.rule=Host(`azure_blob_storage.et.127.0.0.1.nip.io`)
+      - traefik.http.routers.azurite-router.service=et1-service
+      - traefik.http.services.azurite-service.loadbalancer.server.port=10000
     networks:
       - et_full_system
-    profiles:
-      - test
-      - firefox
 volumes:
   rvm:
   global_node_modules:

data/foreman/.env

@@ -30,6 +30,5 @@ AZURE_STORAGE_CONTAINER='et-api-test-container'
 AZURE_STORAGE_DIRECT_UPLOAD_ACCOUNT='devstoreaccount1'
 AZURE_STORAGE_DIRECT_UPLOAD_ACCESS_KEY='Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=='
 AZURE_STORAGE_DIRECT_UPLOAD_CONTAINER='et-api-direct-test-container'
-AZURE_APP_INSIGHTS_KEY=${AZURE_APP_INSIGHTS_KEY}
 GOVUK_NOTIFY_CUSTOM_URL=http://notify.et.127.0.0.1.nip.io:3100
-GOVUK_NOTIFY_API_KEY_LIVE=fake-key-7fc24bc8-1938-1827-bed3-fb237f9cd5e7-c34b3015-02a1-4e01-b922-1ea21f331d4d
+GOVUK_NOTIFY_API_KEY_LIVE=fake-key-7fc24bc8-1938-1827-bed3-fb237f9cd5e7-c34b3015-02a1-4e01-b922-1ea21f331d4d

data/foreman/ComposeProcfile

@@ -0,0 +1,11 @@
+et1_web:  export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et1 http://localhost:$FREEPORT && cd systems/et1 && PORT=$FREEPORT ./run.sh"
+et3_web:  export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et3.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url et3 http://localhost:$FREEPORT && cd systems/et3 && PORT=$FREEPORT ./run.sh"
+api_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url api http://localhost:$FREEPORT && cd systems/api && PORT=$FREEPORT ./run.sh"
+admin_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_admin.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url admin http://localhost:$FREEPORT && cd systems/admin && PORT=$FREEPORT ./run.sh"
+atos_api_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_atos.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url atos_api http://localhost:$FREEPORT && cd systems/atos && PORT=$FREEPORT ./run.sh"
+fake_acas_web: export FREEPORT=$(freeport) && bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_acas http://localhost:$FREEPORT && rvm use && et_fake_acas_server -port $FREEPORT -threads=1 -workers=2"
+fake_ccd_web: export FREEPORT=$(freeport) && bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_ccd http://localhost:$FREEPORT && rvm use && et_fake_ccd start --port=$FREEPORT --create_case_schema=./systems/et_ccd_export/spec/json_schemas/case_create.json"
+fake_notify_web: export FREEPORT=$(freeport) && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/fake_notify.env bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && et_full_system local update_service_url fake_notify http://localhost:$FREEPORT && rvm use && gov_fake_notify start --port=$FREEPORT --config=${FOREMAN_PATH}/gov_fake_notify.yaml"
+et1_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/et1  && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et1.env ./run_sidekiq.sh"
+api_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/api && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_api.env ./run_sidekiq.sh"
+et_ccd_export_sidekiq: bash --login -c "cd ${FS_ROOT_PATH} && et_full_system local wait_for_support && cd systems/et_ccd_export && godotenv -f ${FOREMAN_PATH}/.env godotenv -f ${FOREMAN_PATH}/et_ccd_export.env ./run_sidekiq.sh"

data/foreman/et1.env

@@ -18,4 +18,3 @@ FLATTEN_PDF=false
 SIDEKIQ_ALIVE_PORT=7434
 DISABLE_SIDEKIQ_ALIVE=true
 SERVICE_NOW_EMAIL=fake@servicenow.fake.com
-AZURE_APP_INSIGHTS_ROLE_NAME=et1-fs

data/foreman/et3.env

@@ -1,6 +1,5 @@
 REDIS_URL=redis://redis:6379/5
 RAVEN_DSN='https://7f2374c2e0cd4650bf5129c9fe45215e:e0ae53d01bd7454da963790ee204ffa0@sentry.io/1376078'
 ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api'
-AZURE_APP_INSIGHTS_ROLE_NAME=et3-fs
 DB_NAME=et3_production
 ROOT_URL=http://et3.et.127.0.0.1.nip.io:3100

data/foreman/et_admin.env

@@ -6,4 +6,3 @@ SEED_EXAMPLE_USERS='true'
 S3_UPLOAD_BUCKET='etapibucket'
 RAVEN_DSN='https://ff44444af15e43a287fa10eb4f3fd825:b5764132fc3a42e98d8a7f8ba3042a90@sentry.io/1389908'
 ET_API_URL='http://api.et.127.0.0.1.nip.io:3100/api'
-AZURE_APP_INSIGHTS_ROLE_NAME=et-admin-fs

data/foreman/et_api.env

@@ -7,4 +7,3 @@ S3_DIRECT_UPLOAD_BUCKET='etapidirectbucket'
 RAVEN_DSN='https://929365547a42468fb521248a96100646:139af8327fa340b88088efeae059fca8@sentry.io/1254109'
 ACAS_SERVICE_URL='http://acas.et.127.0.0.1.nip.io:3100/Lookup/ECService.svc'
 DISABLE_SIDEKIQ_ALIVE=true
-AZURE_APP_INSIGHTS_ROLE_NAME=et-api-fs

data/foreman/et_atos.env

@@ -1,4 +1,3 @@
 S3_UPLOAD_BUCKET='etapibucket'
 S3_DIRECT_UPLOAD_BUCKET='etapidirectbucket'
 DB_NAME='et_api_production'
-AZURE_APP_INSIGHTS_ROLE_NAME=et-atos-fs

data/foreman/et_ccd_export.env

@@ -12,5 +12,4 @@ CCD_MICROSERVICE_ID=${CCD_MICROSERVICE_ID}
 CCD_MICROSERVICE_SECRET=${CCD_MICROSERVICE_SECRET}
 DISABLE_SIDEKIQ_ALIVE=true
 CCD_GENERATE_ETHOS_CASE_REFERENCE=false
-AZURE_APP_INSIGHTS_ROLE_NAME=et-ccd-export-fs
 CCD_DOCUMENT_STORE_URL_REWRITE=false

data/lib/et_full_system/cli/local.rb

@@ -85,6 +85,7 @@ module EtFullSystem
     method_option :rails_env, type: :string, default: ENV.fetch('RAILS_ENV', 'production')
     method_option :cloud_provider, type: :string, default: ENV.fetch('CLOUD_PROVIDER', 'amazon')
     method_option :minimal, type: :boolean, default: false, desc: 'Set to true to only start the minimum (db, redis, mail, s3, azure blob, fake_acas, fake_ccd)'
+    method_option :in_docker_compose, type: :boolean, default: false, desc: 'Set to true to assume certain services are in docker compose'
     def server
       puts "Scheduling traefik config and file storage config"
       pid = fork do
@@ -99,7 +100,11 @@ module EtFullSystem
         if options.minimal?
           without = ['et1', 'et3', 'admin', 'api', 'ccd_export', 'atos_api']
         end
-        cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} AZURITE_STORAGE_PATH=\"#{options[:azurite_storage_path]}\" MINIO_STORAGE_PATH=\"#{options[:minio_storage_path]}\" FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/Procfile\" --port=4000"
+        if options.in_docker_compose?
+          cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/ComposeProcfile\" --port=4000"
+        else
+          cmd = "CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} AZURITE_STORAGE_PATH=\"#{options[:azurite_storage_path]}\" MINIO_STORAGE_PATH=\"#{options[:minio_storage_path]}\" FS_ROOT_PATH=#{PROJECT_PATH} FOREMAN_PATH=#{GEM_PATH}/foreman godotenv -f #{GEM_PATH}/foreman/.env invoker start \"#{GEM_PATH}/foreman/Procfile\" --port=4000"
+        end
         STDERR.puts cmd
         unless without.empty?
           stop_cmds = without.reduce([]) do |acc, service|
@@ -396,7 +401,7 @@ module EtFullSystem
       puts cmd
       external_command cmd, 'atos setup'
     end
-    
+
     def setup_ccd_service
       puts "------------------------------------------------ SETTING UP CCD EXPORT SERVICE ---------------------------------------------------"
       cmd ="bash --login -c \"cd #{PROJECT_PATH}/systems/et_ccd_export && CLOUD_PROVIDER=#{options[:cloud_provider]} RAILS_ENV=#{options[:rails_env]} godotenv -f \"#{GEM_PATH}/foreman/.env\" godotenv -f \"#{GEM_PATH}/foreman/et_ccd_export.env\" gem install bundler:1.17.3 && bundle install --with=#{options[:rails_env]}\""

data/lib/et_full_system/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: et_full_system
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre.rc2
+  version: 6.0.0.pre.rc2
 platform: ruby
 authors:
 - Gary Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -150,12 +150,15 @@ files:
 - bin/setup
 - docker/.empty
 - docker/Dockerfile
+- docker/build/pdftk
+- docker/build/run
 - docker/docker-compose.yml
 - docker/pdftk
 - et_full_system.gemspec
 - exe/et_full_system
 - foreman/.env
 - foreman/.foreman
+- foreman/ComposeProcfile
 - foreman/Procfile
 - foreman/et1.env
 - foreman/et3.env