Skip to content

Removed weblogic-deploy-tool downloading #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2021
Merged

Removed weblogic-deploy-tool downloading #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 4 additions & 18 deletions weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/setupAdminDomain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ function cleanup()
echo "Cleaning up temporary files..."

rm -rf $DOMAIN_PATH/admin-domain.yaml
rm -rf $DOMAIN_PATH/weblogic-deploy.zip
rm -rf $DOMAIN_PATH/weblogic-deploy
rm -rf $DOMAIN_PATH/deploy-app.yaml
rm -rf $DOMAIN_PATH/shoppingcart.zip

Expand Down Expand Up @@ -178,25 +176,14 @@ EOF
function create_adminDomain()
{
echo "Creating Admin Only Domain"
echo "Creating domain path /u01/domains"
echo "Downloading weblogic-deploy-tool"

DOMAIN_PATH="/u01/domains"
echo "Creating domain path $DOMAIN_PATH"
sudo mkdir -p $DOMAIN_PATH
sudo rm -rf $DOMAIN_PATH/*

# WebLogic base images are already having weblogic-deploy, hence no need to download
if [ ! -d "$DOMAIN_PATH/weblogic-deploy" ];
then
echo "Deployment tool not found. Downloading..."
cd $DOMAIN_PATH
wget -q $WEBLOGIC_DEPLOY_TOOL
if [[ $? != 0 ]]; then
echo "Error : Downloading weblogic-deploy-tool failed"
exit 1
fi
sudo unzip -o weblogic-deploy.zip -d $DOMAIN_PATH
else
echo "Deploy tool already available at $DOMAIN_PATH/weblogic-deploy"
echo "Deployment tool not found in the path $DOMAIN_PATH"
exit 1
fi

storeCustomSSLCerts
Expand Down Expand Up @@ -502,7 +489,6 @@ installUtilities
mountFileShare

KEYSTORE_PATH="${DOMAIN_PATH}/${wlsDomainName}/keystores"
WEBLOGIC_DEPLOY_TOOL=https://github.com/oracle/weblogic-deploy-tooling/releases/download/weblogic-deploy-tooling-1.8.1/weblogic-deploy.zip
samplApp="https://www.oracle.com/webfolder/technetwork/tutorials/obe/fmw/wls/10g/r3/cluster/session_state/files/shoppingcart.zip"
wlsAdminPort=7001
wlsSSLAdminPort=7002
Expand Down
1 change: 0 additions & 1 deletion ...raclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,6 @@ fi
function create_managedSetup(){
echo "Creating Managed Server Setup"

DOMAIN_PATH="/u01/domains"
sudo mkdir -p $DOMAIN_PATH

cd $DOMAIN_PATH
Expand Down
35 changes: 14 additions & 21 deletions ...cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ function cleanup()
echo "Cleaning up temporary files..."
rm -rf $DOMAIN_PATH/admin-domain.yaml
rm -rf $DOMAIN_PATH/managed-domain.yaml
rm -rf $DOMAIN_PATH/weblogic-deploy.zip
rm -rf $DOMAIN_PATH/weblogic-deploy
rm -rf $DOMAIN_PATH/deploy-app.yaml
rm -rf $DOMAIN_PATH/shoppingcart.zip
rm -rf $DOMAIN_PATH/*.py
Expand Down Expand Up @@ -366,17 +364,16 @@ function create_adminSetup()
echo "Creating domain path $DOMAIN_PATH"

sudo mkdir -p $DOMAIN_PATH
sudo rm -rf $DOMAIN_PATH/*

echo "Downloading weblogic-deploy-tool"
cd $DOMAIN_PATH
wget -q $WEBLOGIC_DEPLOY_TOOL
if [[ $? != 0 ]]; then
echo "Error : Downloading weblogic-deploy-tool failed"
exit 1
fi
sudo unzip -o weblogic-deploy.zip -d $DOMAIN_PATH

# WebLogic base images are already having weblogic-deploy, hence no need to download
if [ ! -d "$DOMAIN_PATH/weblogic-deploy" ];
then
echo "weblogic-deploy tool not found in path $DOMAIN_PATH"
exit 1
fi

storeCustomSSLCerts

create_admin_model
Expand Down Expand Up @@ -472,19 +469,16 @@ function start_nm()

function create_managedSetup(){
echo "Creating Managed Server Setup"
echo "Creating domain path /u01/domains"
DOMAIN_PATH="/u01/domains"
echo "Creating domain path $DOMAIN_PATH"

sudo mkdir -p $DOMAIN_PATH
sudo rm -rf $DOMAIN_PATH/*

echo "Downloading weblogic-deploy-tool"
cd $DOMAIN_PATH
wget -q $WEBLOGIC_DEPLOY_TOOL
if [[ $? != 0 ]]; then
echo "Error : Downloading weblogic-deploy-tool failed"
exit 1
# WebLogic base images are already having weblogic-deploy, hence no need to download
if [ ! -d "$DOMAIN_PATH/weblogic-deploy" ];
then
echo "weblogic-deploy tool not found in path $DOMAIN_PATH"
exit 1
fi
sudo unzip -o weblogic-deploy.zip -d $DOMAIN_PATH

storeCustomSSLCerts

Expand Down Expand Up @@ -855,7 +849,6 @@ nmHost=`hostname`
nmPort=5556
machineNamePrefix="machine"
machineName="$machineNamePrefix-$nmHost"
WEBLOGIC_DEPLOY_TOOL=https://github.com/oracle/weblogic-deploy-tooling/releases/download/weblogic-deploy-tooling-1.8.1/weblogic-deploy.zip
username="oracle"
groupname="oracle"

Expand Down