diff options
author | Jim Hahn <jrh3@att.com> | 2021-04-07 09:32:31 -0400 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2021-04-07 12:55:02 -0400 |
commit | 8f8a6d8d207e30303efbedd7f60ca397c2c61970 (patch) | |
tree | 4ffd5fa07c87ffbe2c59195b0d9f0cca7a02e79e /packages | |
parent | 605ce7bb27bd15f45064418a05599acdea373562 (diff) |
Use sh instead of ash in drools-pdp
Issue-ID: POLICY-3160
Change-Id: I37b2b75d010781108e40ae39d3742bc2c2e2fd7e
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'packages')
-rw-r--r-- | packages/base/src/files/bin/configure-maven | 4 | ||||
-rw-r--r-- | packages/base/src/files/bin/monitor | 4 | ||||
-rw-r--r-- | packages/base/src/files/bin/policy | 4 | ||||
-rw-r--r-- | packages/base/src/files/etc/profile.d/env.sh | 4 | ||||
-rw-r--r-- | packages/docker/src/main/docker/Dockerfile | 2 | ||||
-rw-r--r-- | packages/docker/src/main/docker/pdpd-entrypoint.sh | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/packages/base/src/files/bin/configure-maven b/packages/base/src/files/bin/configure-maven index 34d6de70..70c3d0cc 100644 --- a/packages/base/src/files/bin/configure-maven +++ b/packages/base/src/files/bin/configure-maven @@ -1,9 +1,9 @@ -#!/usr/bin/env ash +#!/usr/bin/env sh # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/base/src/files/bin/monitor b/packages/base/src/files/bin/monitor index 864582f1..941fe62e 100644 --- a/packages/base/src/files/bin/monitor +++ b/packages/base/src/files/bin/monitor @@ -1,9 +1,9 @@ -#!/usr/bin/env ash +#!/usr/bin/env sh # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/base/src/files/bin/policy b/packages/base/src/files/bin/policy index 3ba75f0d..690fe1e5 100644 --- a/packages/base/src/files/bin/policy +++ b/packages/base/src/files/bin/policy @@ -1,9 +1,9 @@ -#!/usr/bin/env ash +#!/usr/bin/env sh # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/base/src/files/etc/profile.d/env.sh b/packages/base/src/files/etc/profile.d/env.sh index a1b9fa7d..1a4d067f 100644 --- a/packages/base/src/files/etc/profile.d/env.sh +++ b/packages/base/src/files/etc/profile.d/env.sh @@ -1,9 +1,9 @@ -#!/bin/ash +#!/bin/sh ### # ============LICENSE_START======================================================= # ONAP # ================================================================================ -# Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/packages/docker/src/main/docker/Dockerfile b/packages/docker/src/main/docker/Dockerfile index fb7d4c13..361d9a8f 100644 --- a/packages/docker/src/main/docker/Dockerfile +++ b/packages/docker/src/main/docker/Dockerfile @@ -60,7 +60,7 @@ COPY --chown=policy:policy /maven/install-drools.zip pdpd-entrypoint.sh $POLICY_ WORKDIR $POLICY_INSTALL USER policy:policy -SHELL ["/bin/ash", "-c"] +SHELL ["/bin/sh", "-c"] RUN unzip -o install-drools.zip && \ rm install-drools.zip && \ chown -R policy:policy * && \ diff --git a/packages/docker/src/main/docker/pdpd-entrypoint.sh b/packages/docker/src/main/docker/pdpd-entrypoint.sh index e12f7d5b..8f801a45 100644 --- a/packages/docker/src/main/docker/pdpd-entrypoint.sh +++ b/packages/docker/src/main/docker/pdpd-entrypoint.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env ash +#!/usr/bin/env sh # ######################################################################## # Copyright 2019-2021 AT&T Intellectual Property. All rights reserved @@ -155,7 +155,7 @@ function db { fi echo "Wating for ${SQL_HOST} ." - timeout 120 ash -c 'until nc -vz "${SQL_HOST}" 3306; do echo -n "."; sleep 1; done'; echo $? + timeout 120 sh -c 'until nc -vz "${SQL_HOST}" 3306; do echo -n "."; sleep 1; done'; echo $? "${POLICY_HOME}"/bin/db-migrator -s ALL -o upgrade } |