Skip to content

Commit fc167a2

Browse files
francesco-defalcofrancesco-defalco
authored
Merge pull request #7 from HCL-TECH-SOFTWARE/10.2.5_hcl
10.2.5 hcl
2 parents 8afb040 + 5dcd4f6 commit fc167a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+48883
-120978
lines changed

‎AIDA.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ down_volumes() {
6868
}
6969

7070
build() {
71-
docker compose -f $yml build --build-arg REGISTRY='hclcr.io/wa/workload-automation/hcl-' --build-arg VERSION=10.2.4
71+
docker compose -f $yml build --build-arg REGISTRY='hclcr.io/wa/workload-automation/hcl-' --build-arg VERSION=10.2.5
7272
docker compose -f $yml up --no-start
7373
}
7474

7575
build_start() {
76-
docker compose -f $yml build --build-arg REGISTRY='hclcr.io/wa/workload-automation/hcl-' --build-arg VERSION=10.2.4 $1
76+
docker compose -f $yml build --build-arg REGISTRY='hclcr.io/wa/workload-automation/hcl-' --build-arg VERSION=10.2.5 $1
7777
docker compose -f $yml up -d $1
7878
}
7979

@@ -112,7 +112,7 @@ first_start() {
112112
}
113113

114114
start_config() {
115-
if ! docker image inspect "hclcr.io/wa/workload-automation/hcl-aida-config:10.2.4" >&/dev/null; then
115+
if ! docker image inspect "hclcr.io/wa/workload-automation/hcl-aida-config:10.2.5" >&/dev/null; then
116116
echo "Loading configuration container image..."
117117
for f in ../aida-*.t*; do cat $f | docker load; done
118118
fi

‎Dockerfile-ad‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ FROM ${REGISTRY}aida-ad:${VERSION} AS base
1414
EXPOSE 5000
1515

1616
FROM base AS dev
17+
USER 0
1718
RUN pip install debugpy
19+
USER default:users
1820
CMD python -m debugpy --listen 0.0.0.0:5678 -m gunicorn -b 0.0.0.0:5000 -k gthread --reload -t 0 'server:app'
1921

2022
FROM base AS debug
21-
23+
USER 0
2224
RUN pip install debugpy
23-
25+
USER default:users
2426
CMD python -m debugpy --wait-for-client --listen 0.0.0.0:5678 -m gunicorn -b 0.0.0.0:5000 -k gthread --reload -t 0 'server:app'
2527

2628
FROM base as release

‎Dockerfile-email‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ WORKDIR /usr/src/app
1414
EXPOSE 5000
1515

1616
FROM base AS dev
17+
USER 0
1718
RUN pip install debugpy
19+
USER default:users
1820
CMD python -m debugpy --listen 0.0.0.0:5678 -m gunicorn -b 0.0.0.0:5000 -k gthread -w 1 --threads 1 --reload -t 0 'sendMail:app'
1921

2022
FROM base AS debug
23+
USER 0
2124
RUN pip install debugpy
25+
USER default:users
2226
CMD python -m debugpy --wait-for-client --listen 0.0.0.0:5678 -m gunicorn -b 0.0.0.0:5000 -k gthread -w 1 --threads 1 --reload -t 0 'sendMail:app'
2327

24-
2528
FROM base AS release
2629
CMD gunicorn -b 0.0.0.0:5000 -k gthread -w 1 --threads 1 'sendMail:app'

‎Dockerfile-exporter‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ FROM ${REGISTRY}aida-exporter:${VERSION} AS base
1313
WORKDIR /usr/src/app
1414

1515
FROM base AS dev
16+
USER 0
1617
RUN pip install debugpy
17-
18+
USER default:users
1819
CMD python -m debugpy --listen 0.0.0.0:5678 exporter.py
1920

2021
FROM base AS debug
21-
22+
USER 0
2223
RUN pip install debugpy
23-
24+
USER default:users
2425
CMD python -m debugpy --wait-for-client --listen 0.0.0.0:5678 exporter.py
2526

2627
FROM base AS release

‎Dockerfile-orchestrator‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@ COPY ./redis/redis.key .
1515
COPY ./redis/ca.pem .
1616

1717
FROM base AS dev
18+
USER 0
1819
RUN pip install debugpy
20+
USER default:users
1921
CMD python -m debugpy --listen 0.0.0.0:5678 Orchestrator.py
2022

2123
FROM base AS debug
24+
USER 0
2225
RUN pip install debugpy
26+
USER default:users
2327
CMD python -m debugpy --wait-for-client --listen 0.0.0.0:5678 Orchestrator.py
2428

2529

‎Dockerfile-predictor‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@ COPY ./redis/redis.key .
1616
COPY ./redis/ca.pem .
1717

1818
FROM base AS dev
19+
USER 0
1920
RUN pip install debugpy
20-
21+
USER default:users
2122
CMD python -m debugpy --listen 0.0.0.0:5678 -m gunicorn -b 0.0.0.0:5000 -k gthread --reload -t 0 'server:app'
2223

2324
FROM base AS debug
25+
USER 0
2426
RUN pip install debugpy
27+
USER default:users
2528
CMD python -m debugpy --wait-for-client --listen 0.0.0.0:5678 -m gunicorn -b 0.0.0.0:5000 -k gthread --reload -t 0 'server:app'
2629

2730
FROM base AS release

‎ILMT/hcltechsw.com-AI_Data_Advisor.swidtag‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<SoftwareIdentity name="AI Data Advisor" tagId="hcltechsw.com-c6c4bf76a7d34c22a24bdc0a882f80bf-10.2.4.0" version="10.2.4.0" versionScheme="multipartnumeric" xml:lang="en" xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd schema.xsd">
2+
<SoftwareIdentity name="AI Data Advisor" tagId="hcltechsw.com-c6c4bf76a7d34c22a24bdc0a882f80bf-10.2.5.0" version="10.2.5.0" versionScheme="multipartnumeric" xml:lang="en" xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd schema.xsd">
33
<Meta persistentId="c6c4bf76a7d34c22a24bdc0a882f80bf"/>
44
<Meta generator="HCL ISO SWID TAG 0.1"/>
55
<Meta componentonly="true"/>

‎ILMT/ibm.com_AI_Data_Advisor-10.2.3.swidtag‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="AI Data Advisor" tagId="ibm.com-c6c4bf76a7d34c22a24bdc0a882f80bf-10.2.4" version="10.2.4" versionScheme="multipartnumeric" xml:lang="en" xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd schema.xsd">
2+
<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="AI Data Advisor" tagId="ibm.com-c6c4bf76a7d34c22a24bdc0a882f80bf-10.2.5" version="10.2.5" versionScheme="multipartnumeric" xml:lang="en" xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd schema.xsd">
33
<Meta persistentId="c6c4bf76a7d34c22a24bdc0a882f80bf"/>
44
<Meta generator="4-1-20210113"/>
55
<Entity name="IBM" regid="ibm.com" role="licensor tagCreator softwareCreator"/>

‎ILMT/ibm.com_AI_Data_Advisor-10.2.5.swidtag‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<SoftwareIdentity xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="AI Data Advisor" tagId="ibm.com-c6c4bf76a7d34c22a24bdc0a882f80bf-10.2.5" version="10.2.5" versionScheme="multipartnumeric" xml:lang="en" xsi:schemaLocation="http://standards.iso.org/iso/19770/-2/2015-current/schema.xsd schema.xsd">
3+
<Meta persistentId="c6c4bf76a7d34c22a24bdc0a882f80bf"/>
4+
<Meta generator="4-1-20210113"/>
5+
<Entity name="IBM" regid="ibm.com" role="licensor tagCreator softwareCreator"/>
6+
</SoftwareIdentity>

0 commit comments

Comments
 (0)