summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2021-04-07 09:32:31 -0400
committerJim Hahn <jrh3@att.com>2021-04-07 12:55:02 -0400
commit8f8a6d8d207e30303efbedd7f60ca397c2c61970 (patch)
tree4ffd5fa07c87ffbe2c59195b0d9f0cca7a02e79e
parent605ce7bb27bd15f45064418a05599acdea373562 (diff)
Use sh instead of ash in drools-pdp
Issue-ID: POLICY-3160 Change-Id: I37b2b75d010781108e40ae39d3742bc2c2e2fd7e Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--feature-controller-logging/src/main/feature/install/disable4
-rw-r--r--feature-controller-logging/src/main/feature/install/enable4
-rw-r--r--feature-distributed-locking/src/main/feature/install/disable4
-rw-r--r--feature-distributed-locking/src/main/feature/install/enable4
-rw-r--r--feature-eelf/src/main/feature/install/disable4
-rw-r--r--feature-eelf/src/main/feature/install/enable4
-rwxr-xr-xfeature-mdc-filters/src/main/feature/install/disable4
-rwxr-xr-xfeature-mdc-filters/src/main/feature/install/enable4
-rw-r--r--packages/base/src/files/bin/configure-maven4
-rw-r--r--packages/base/src/files/bin/monitor4
-rw-r--r--packages/base/src/files/bin/policy4
-rw-r--r--packages/base/src/files/etc/profile.d/env.sh4
-rw-r--r--packages/docker/src/main/docker/Dockerfile2
-rw-r--r--packages/docker/src/main/docker/pdpd-entrypoint.sh4
-rw-r--r--policy-management/src/main/server-gen/bin/add-secured-participant4
-rw-r--r--policy-management/src/main/server-gen/bin/create-api-key4
-rw-r--r--policy-management/src/main/server-gen/bin/create-secured-topic4
-rw-r--r--policy-management/src/main/server-gen/bin/db-migrator2
-rw-r--r--policy-management/src/main/server-gen/bin/deploy-artifact4
-rw-r--r--policy-management/src/main/server-gen/bin/features4
-rw-r--r--policy-management/src/main/server-gen/bin/pdpd-configuration4
-rw-r--r--policy-management/src/main/server-gen/bin/policy-management-controller4
-rw-r--r--policy-management/src/main/server-gen/bin/rest-add-controller6
-rw-r--r--policy-management/src/main/server-gen/bin/rest-delete-controller4
-rw-r--r--policy-management/src/main/server-gen/bin/telemetry4
25 files changed, 49 insertions, 49 deletions
diff --git a/feature-controller-logging/src/main/feature/install/disable b/feature-controller-logging/src/main/feature/install/disable
index 8233ec61..f35c1dac 100644
--- a/feature-controller-logging/src/main/feature/install/disable
+++ b/feature-controller-logging/src/main/feature/install/disable
@@ -1,9 +1,9 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
# ============LICENSE_START=======================================================
# feature-controller-logging
# ================================================================================
-# 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/feature-controller-logging/src/main/feature/install/enable b/feature-controller-logging/src/main/feature/install/enable
index d74bed8a..55ae942c 100644
--- a/feature-controller-logging/src/main/feature/install/enable
+++ b/feature-controller-logging/src/main/feature/install/enable
@@ -1,9 +1,9 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
# ============LICENSE_START=======================================================
# feature-controller-logging
# ================================================================================
-# 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/feature-distributed-locking/src/main/feature/install/disable b/feature-distributed-locking/src/main/feature/install/disable
index c1b0fbc2..be455734 100644
--- a/feature-distributed-locking/src/main/feature/install/disable
+++ b/feature-distributed-locking/src/main/feature/install/disable
@@ -1,9 +1,9 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
# ============LICENSE_START=======================================================
# ONAP
# ================================================================================
-# Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018-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/feature-distributed-locking/src/main/feature/install/enable b/feature-distributed-locking/src/main/feature/install/enable
index 5b8d1cb4..af202f56 100644
--- a/feature-distributed-locking/src/main/feature/install/enable
+++ b/feature-distributed-locking/src/main/feature/install/enable
@@ -1,9 +1,9 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
# ============LICENSE_START=======================================================
# ONAP
# ================================================================================
-# Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018-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/feature-eelf/src/main/feature/install/disable b/feature-eelf/src/main/feature/install/disable
index 5f3d178c..eb4e0fac 100644
--- a/feature-eelf/src/main/feature/install/disable
+++ b/feature-eelf/src/main/feature/install/disable
@@ -1,10 +1,10 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
###
# ============LICENSE_START=======================================================
# ONAP POLICY
# ================================================================================
-# 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/feature-eelf/src/main/feature/install/enable b/feature-eelf/src/main/feature/install/enable
index b80e21bc..50cd9c1e 100644
--- a/feature-eelf/src/main/feature/install/enable
+++ b/feature-eelf/src/main/feature/install/enable
@@ -1,10 +1,10 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
###
# ============LICENSE_START=======================================================
# ONAP POLICY
# ================================================================================
-# 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/feature-mdc-filters/src/main/feature/install/disable b/feature-mdc-filters/src/main/feature/install/disable
index dda7e695..c95f6f9b 100755
--- a/feature-mdc-filters/src/main/feature/install/disable
+++ b/feature-mdc-filters/src/main/feature/install/disable
@@ -1,10 +1,10 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
###
# ============LICENSE_START=======================================================
# feature-mdc-filters
# ================================================================================
-# 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/feature-mdc-filters/src/main/feature/install/enable b/feature-mdc-filters/src/main/feature/install/enable
index 63f907e8..9066d9d7 100755
--- a/feature-mdc-filters/src/main/feature/install/enable
+++ b/feature-mdc-filters/src/main/feature/install/enable
@@ -1,10 +1,10 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
###
# ============LICENSE_START=======================================================
# feature-mdc-filters
# ================================================================================
-# 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/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
}
diff --git a/policy-management/src/main/server-gen/bin/add-secured-participant b/policy-management/src/main/server-gen/bin/add-secured-participant
index 4a776703..edd92e10 100644
--- a/policy-management/src/main/server-gen/bin/add-secured-participant
+++ b/policy-management/src/main/server-gen/bin/add-secured-participant
@@ -1,10 +1,10 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
###
# ============LICENSE_START=======================================================
# policy-management
# ================================================================================
-# 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/policy-management/src/main/server-gen/bin/create-api-key b/policy-management/src/main/server-gen/bin/create-api-key
index d5af491f..7870265e 100644
--- a/policy-management/src/main/server-gen/bin/create-api-key
+++ b/policy-management/src/main/server-gen/bin/create-api-key
@@ -1,10 +1,10 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
###
# ============LICENSE_START=======================================================
# policy-management
# ================================================================================
-# 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/policy-management/src/main/server-gen/bin/create-secured-topic b/policy-management/src/main/server-gen/bin/create-secured-topic
index 6e058142..f906bb55 100644
--- a/policy-management/src/main/server-gen/bin/create-secured-topic
+++ b/policy-management/src/main/server-gen/bin/create-secured-topic
@@ -1,10 +1,10 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
###
# ============LICENSE_START=======================================================
# policy-management
# ================================================================================
-# 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/policy-management/src/main/server-gen/bin/db-migrator b/policy-management/src/main/server-gen/bin/db-migrator
index 3151e7c3..8ae2c7d4 100644
--- a/policy-management/src/main/server-gen/bin/db-migrator
+++ b/policy-management/src/main/server-gen/bin/db-migrator
@@ -1,4 +1,4 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
# ============LICENSE_START=======================================================
# ONAP
diff --git a/policy-management/src/main/server-gen/bin/deploy-artifact b/policy-management/src/main/server-gen/bin/deploy-artifact
index 2ba42fb9..760dc7a6 100644
--- a/policy-management/src/main/server-gen/bin/deploy-artifact
+++ b/policy-management/src/main/server-gen/bin/deploy-artifact
@@ -1,9 +1,9 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
# ============LICENSE_START=======================================================
# ONAP
# ================================================================================
-# Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2018-2021 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright (C) 2020 Bell Canada.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/policy-management/src/main/server-gen/bin/features b/policy-management/src/main/server-gen/bin/features
index fc1f239f..93f58239 100644
--- a/policy-management/src/main/server-gen/bin/features
+++ b/policy-management/src/main/server-gen/bin/features
@@ -1,10 +1,10 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
###
# ============LICENSE_START=======================================================
# ONAP POLICY
# ================================================================================
-# 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/policy-management/src/main/server-gen/bin/pdpd-configuration b/policy-management/src/main/server-gen/bin/pdpd-configuration
index a704a577..c3fb43b5 100644
--- a/policy-management/src/main/server-gen/bin/pdpd-configuration
+++ b/policy-management/src/main/server-gen/bin/pdpd-configuration
@@ -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/policy-management/src/main/server-gen/bin/policy-management-controller b/policy-management/src/main/server-gen/bin/policy-management-controller
index 3d6fb190..9361ebd2 100644
--- a/policy-management/src/main/server-gen/bin/policy-management-controller
+++ b/policy-management/src/main/server-gen/bin/policy-management-controller
@@ -1,9 +1,9 @@
-#!/usr/bin/env ash
+#!/usr/bin/env sh
# ============LICENSE_START=======================================================
# ONAP POLICY
# ================================================================================
-# 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/policy-management/src/main/server-gen/bin/rest-add-controller b/policy-management/src/main/server-gen/bin/rest-add-controller
index 3bd02be8..28369ab6 100644
--- a/policy-management/src/main/server-gen/bin/rest-add-controller
+++ b/policy-management/src/main/server-gen/bin/rest-add-controller
@@ -1,16 +1,16 @@
-#!/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.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/policy-management/src/main/server-gen/bin/rest-delete-controller b/policy-management/src/main/server-gen/bin/rest-delete-controller
index 8a8b9f65..8782a8b3 100644
--- a/policy-management/src/main/server-gen/bin/rest-delete-controller
+++ b/policy-management/src/main/server-gen/bin/rest-delete-controller
@@ -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/policy-management/src/main/server-gen/bin/telemetry b/policy-management/src/main/server-gen/bin/telemetry
index cead3d3a..b17a95b8 100644
--- a/policy-management/src/main/server-gen/bin/telemetry
+++ b/policy-management/src/main/server-gen/bin/telemetry
@@ -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.