diff options
| author |   Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-03-27 17:09:48 -0400 |
|---|---|---|
| committer | Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-03-27 17:09:48 -0400 |
| commit | 99b982918fe3c9a33b0f221bdfafd7b710b9edb6 (patch) | |
| tree | 02cfd6a97ea68726185a2343da7cc6803fef18c4 | |
| parent | 11b79e5093d8e7fa45b0ce4eceda0b56c27f13fa (diff) | |
fixing invalid database name
The db name changed from portal to portal_os
but all the other SQL files use portal and nothing
is using portal_os.
all containers are blocked by this failure:
/usr/local/bin/docker-entrypoint.sh:
running /docker-entrypoint-initdb.d/PortalDDLMySql_2_1_Common.sql
ERROR 1049 (42000) at line 16: Unknown database 'portal'
Issue-ID: OOM-746
Change-Id: I6287c71ebe318e8224255e5406563d4f13806046
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com>
| -rw-r--r-- | deliveries/Dockerfile.mariadb | 8 | ||||
| -rwxr-xr-x | deliveries/os_docker_push.sh | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/deliveries/Dockerfile.mariadb b/deliveries/Dockerfile.mariadb index 347cc1e0..6d2d6f2e 100644 --- a/deliveries/Dockerfile.mariadb +++ b/deliveries/Dockerfile.mariadb @@ -16,7 +16,7 @@ COPY ${DB_SCRIPT_DIR}/PortalDMLMySql_2_1_OS.sql /docker-entrypoint-initdb.d/ # Do not copy the onboarding script here; it's mounted as a volume # SDK App DDL and DML -COPY ${DB_SCRIPT_DIR}/EcompSdkDDLMySql_1710_Common.sql /docker-entrypoint-initdb.d/ -COPY ${DB_SCRIPT_DIR}/EcompSdkDDLMySql_1710_OS.sql /docker-entrypoint-initdb.d/ -COPY ${DB_SCRIPT_DIR}/EcompSdkDMLMySql_1710_Common.sql /docker-entrypoint-initdb.d/ -COPY ${DB_SCRIPT_DIR}/EcompSdkDMLMySql_1710_OS.sql /docker-entrypoint-initdb.d/ +COPY ${DB_SCRIPT_DIR}/EcompSdkDDLMySql_2_2_Common.sql /docker-entrypoint-initdb.d/ +COPY ${DB_SCRIPT_DIR}/EcompSdkDDLMySql_2_2_OS.sql /docker-entrypoint-initdb.d/ +COPY ${DB_SCRIPT_DIR}/EcompSdkDMLMySql_2_2_Common.sql /docker-entrypoint-initdb.d/ +COPY ${DB_SCRIPT_DIR}/EcompSdkDMLMySql_2_2_OS.sql /docker-entrypoint-initdb.d/ diff --git a/deliveries/os_docker_push.sh b/deliveries/os_docker_push.sh index 39035199..0978ad83 100755 --- a/deliveries/os_docker_push.sh +++ b/deliveries/os_docker_push.sh @@ -13,7 +13,11 @@ if [ -z "$PORTAL_VERSION" ]; then fi TIMESTAMP=$(date +%C%y%m%dT%H%M%S) -export VERSION="${PORTAL_VERSION}-${TIMESTAMP}" -export LATEST="latest" +# commenting the following two configurations as lf team preferred the uncommented format below +#export VERSION="${PORTAL_VERSION}-${TIMESTAMP}" +#export LATEST="latest" + +export VERSION="${PORTAL_VERSION}-STAGING-${TIMESTAMP}" +export LATEST="${PORTAL_VERSION}-STAGING-latest" exec ./os_docker_base.sh |