et_full_system 0.1.52.pre → 0.1.52.pre2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/docker/docker-compose.yml +5 -3
- data/foreman/et_ccd_export.env +2 -0
- data/lib/et_full_system/cli/docker/server.rb +2 -2
- data/lib/et_full_system/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cc0ee7207f7bfeea44a13335a1c1bde5f67e258f798cfcc2483e2c092ca2fe1c
|
|
4
|
+
data.tar.gz: 6935dd4c0f4f3bcb60e0193c8c523a740858e620aa38758c1c24f84304705b9b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 85ce6bcfda7fc8f6091b27fd7c10893dd20da86c2cd987ab3eb900d7a4570e2975050ca9cab54c43567894cd4629d54f4dc102ae46eeb7431208a646d6a87c62
|
|
7
|
+
data.tar.gz: 41962182e084207cb82ae3451c33fcef8f67ac35c8c84e4b5526d3db6e0f78069e4c2f4f28431f3b98e4b2bfeee3e2f2ad3cf33e74bbc51b4376923140fb72c2
|
data/Gemfile.lock
CHANGED
data/docker/docker-compose.yml
CHANGED
|
@@ -41,10 +41,12 @@ services:
|
|
|
41
41
|
AZURITE_STORAGE_PATH: /home/app/azure_storage_data
|
|
42
42
|
MINIO_STORAGE_PATH: /home/app/minio_data
|
|
43
43
|
SHOW_DOWNTIME_BANNER:
|
|
44
|
-
CCD_AUTH_BASE_URL: ${CCD_AUTH_BASE_URL:-http://ccd.et.127.0.0.1.nip.io/auth}
|
|
45
|
-
CCD_IDAM_BASE_URL: ${CCD_IDAM_BASE_URL:-http://ccd.et.127.0.0.1.nip.io/idam}
|
|
46
|
-
CCD_DATA_STORE_BASE_URL: ${CCD_DATA_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io/data_store}
|
|
44
|
+
CCD_AUTH_BASE_URL: ${CCD_AUTH_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/auth}
|
|
45
|
+
CCD_IDAM_BASE_URL: ${CCD_IDAM_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/idam}
|
|
46
|
+
CCD_DATA_STORE_BASE_URL: ${CCD_DATA_STORE_BASE_URL:-http://ccd.et.127.0.0.1.nip.io:3100/data_store}
|
|
47
47
|
CCD_USE_SIDAM: ${CCD_USE_SIDAM:-true}
|
|
48
|
+
CCD_MICROSERVICE_ID: ${CCD_MICROSERVICE_ID:-ccd_gw}
|
|
49
|
+
CCD_MICROSERVICE_SECRET: ${CCD_MICROSERVICE_SECRET:-'AAAAAAAAAAAAAAAC'}
|
|
48
50
|
|
|
49
51
|
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}"
|
|
50
52
|
links:
|
data/foreman/et_ccd_export.env
CHANGED
|
@@ -8,8 +8,8 @@ module EtFullSystem
|
|
|
8
8
|
BEFORE_BOOT_SCRIPT =
|
|
9
9
|
desc "up", "Starts the full system server on docker"
|
|
10
10
|
method_option :without, type: :array, default: [], banner: "service1 service2", desc: "If specified, disables the specified services from running. The services are et1_web, et1_sidekiq, et3_web, mail_web, api_web, api_sidekiq, admin_web, atos_api_web, s3_web, azure_blob_web, fake_acas_web, fake_ccd_web"
|
|
11
|
-
method_option :ccd_docker, type: :boolean, default: false, aliases: 'ccd-docker'
|
|
12
|
-
method_option :ccd_docker_host, type: :string, default: 'docker.for.mac.localhost', aliases: 'ccd-docker-host'
|
|
11
|
+
method_option :ccd_docker, type: :boolean, default: false, aliases: 'ccd-docker', desc: "If specified, instead of using the built in fake ccd server, the system will connect to your local machine (see ccd-docker-host option also)"
|
|
12
|
+
method_option :ccd_docker_host, type: :string, default: 'docker.for.mac.localhost', aliases: 'ccd-docker-host', desc: "Only used if ccd-docker=true. This specifies the host name of your machine when viewed from inside the docker container. This defaults to docker.for.mac.localhost which is suitable for mac OSX only. Consult docker documentation for other systems"
|
|
13
13
|
def up(*args)
|
|
14
14
|
Bundler.with_original_env do
|
|
15
15
|
server_args = []
|