From 31a7298832a19765799db74124ff9dae4e8c189d Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Mon, 30 Nov 2020 15:45:06 -0500 Subject: move all bash to ash shell scripts - xacml bash scripts convert to ash Issue-ID: POLICY-2847 Change-Id: I181e353997d8874eaadd73d6c39594c04a856e4c Signed-off-by: Taka Cho --- packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile | 2 +- .../policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'packages/policy-xacmlpdp-docker') diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile index 009e2c67..e8f8b87a 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile +++ b/packages/policy-xacmlpdp-docker/src/main/docker/Dockerfile @@ -42,4 +42,4 @@ RUN chown -R policy:policy * && chmod 755 bin/*.sh && chmod 755 mysql/bin/*.sh USER policy WORKDIR $POLICY_HOME/bin -ENTRYPOINT [ "bash", "./policy-pdpx.sh" ] +ENTRYPOINT [ "./policy-pdpx.sh" ] diff --git a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh index a4257c38..e818f41d 100644 --- a/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh +++ b/packages/policy-xacmlpdp-docker/src/main/docker/policy-pdpx.sh @@ -1,4 +1,4 @@ -#!/bin/bash -x +#!/usr/bin/env ash # # ============LICENSE_START======================================================= # Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. @@ -32,27 +32,26 @@ else CONFIG_FILE=${CONFIG_FILE} fi -if [ -z "$CONFIG_FILE" ] - then +if [ -z "$CONFIG_FILE" ]; then CONFIG_FILE="${POLICY_HOME}/etc/defaultConfig.json" fi -if [[ -f "${POLICY_HOME}"/etc/mounted/policy-truststore ]]; then +if [ -f "${POLICY_HOME}/etc/mounted/policy-truststore" ]; then echo "overriding policy-truststore" cp -f "${POLICY_HOME}"/etc/mounted/policy-truststore "${TRUSTSTORE}" fi -if [[ -f "${POLICY_HOME}"/etc/mounted/policy-keystore ]]; then +if [ -f "${POLICY_HOME}/etc/mounted/policy-keystore" ]; then echo "overriding policy-keystore" cp -f "${POLICY_HOME}"/etc/mounted/policy-keystore "${KEYSTORE}" fi -if [[ -f "${POLICY_HOME}"/etc/mounted/xacml.properties ]]; then +if [ -f "${POLICY_HOME}/etc/mounted/xacml.properties" ]; then echo "overriding xacml.properties in guards application" cp -f "${POLICY_HOME}"/etc/mounted/xacml.properties "${POLICY_HOME}"/apps/guard/ fi -if [[ -f "${POLICY_HOME}"/etc/mounted/logback.xml ]]; then +if [ -f "${POLICY_HOME}/etc/mounted/logback.xml" ]; then echo "overriding logback.xml" cp -f "${POLICY_HOME}"/etc/mounted/logback.xml "${POLICY_HOME}"/etc/ fi -- cgit 1.2.3-korg