From 8f8a6d8d207e30303efbedd7f60ca397c2c61970 Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Wed, 7 Apr 2021 09:32:31 -0400
Subject: Use sh instead of ash in drools-pdp

Issue-ID: POLICY-3160
Change-Id: I37b2b75d010781108e40ae39d3742bc2c2e2fd7e
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 packages/docker/src/main/docker/Dockerfile         | 2 +-
 packages/docker/src/main/docker/pdpd-entrypoint.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/docker/src')

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
 }
-- 
cgit 1.2.3-korg