Skip to content
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

added changes to use perl from docker image instead of local #375

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added changes to use perl from docker image instead of local #375

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
57 changes: 54 additions & 3 deletions cloud/docker/build_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,28 @@ ARG_JRESPLMNT_VERSION="na"
ARG_JRESPLMNT_SHORT_VERSION="na"
ARG_JRESPLMNT_HOTFIX="na"

#Pre check perl existance
PERL_UTILITY_CHECK="false"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nareshkumarthota can you rename PERL_UTILITY_CHECK flag to something like PERL_INSTALLED?

if command -v perl >/dev/null 2>&1; then
PERL_UTILITY_CHECK="true"
else
#install perl utility image
DOCKER_PKG=$( which docker )
if [ "$DOCKER_PKG" == "" ]; then
echo "ERROR: Build tool[docker] not found. Please install docker or perl utility."
exit 1
fi
PERL_UTILITY_IMAGE_NAME="be-perl-utility-$TEMP_FOLDER:v1"
docker run --name=mytempcontainer-$TEMP_FOLDER -it docker.io/library/ubuntu:20.04 /bin/bash -c "apt-get update > /dev/null 2>&1 && apt-get install -y unzip > /dev/null 2>&1 && exit" > /dev/null 2>&1 && docker commit mytempcontainer-$TEMP_FOLDER $PERL_UTILITY_IMAGE_NAME > /dev/null 2>&1 && docker rm mytempcontainer-$TEMP_FOLDER > /dev/null 2>&1
fi

# container image size optimize related vars
OPTIMIZATION_SUPPORTED_MODULES=$(perl -e 'require "./lib/be_container_optimize.pl"; print be_container_optimize::get_all_modules_print_friendly()')
if [ "$PERL_UTILITY_CHECK" = "true" ]; then
OPTIMIZATION_SUPPORTED_MODULES=$(perl -e 'require "./lib/be_container_optimize.pl"; print be_container_optimize::get_all_modules_print_friendly()')
else
OPTIMIZATION_SUPPORTED_MODULES=$(docker run --rm -v .:/app -w /app $PERL_UTILITY_IMAGE_NAME perl -e 'require "./lib/be_container_optimize.pl"; print be_container_optimize::get_all_modules_print_friendly()')
fi

INCLUDE_MODULES="na"

USAGE="\nUsage: $FILE_NAME"
Expand Down Expand Up @@ -691,7 +711,26 @@ if ! [ "$ARG_OPTIMIZE" = "na" ]; then
CDDFILE="na"
EARFILE="na"
fi
INCLUDE_MODULES=$(perl -e 'require "./lib/be_container_optimize.pl"; print be_container_optimize::parse_optimize_modules("'$ARG_OPTIMIZE'","'$CDDFILE'","'$EARFILE'")')

if [ "$PERL_UTILITY_CHECK" = "true" ]; then
INCLUDE_MODULES=$(perl -e 'require "./lib/be_container_optimize.pl"; print be_container_optimize::parse_optimize_modules("'$ARG_OPTIMIZE'","'$CDDFILE'","'$EARFILE'")')
else
if [ "$ARG_BUILD_TOOL" == "buildah" ]; then
if docker image inspect $PERL_UTILITY_IMAGE_NAME > /dev/null 2>&1; then
docker rmi -f $PERL_UTILITY_IMAGE_NAME > /dev/null 2>&1
fi
echo "ERROR: Build tool[buildah] not supported. Please install docker or perl utility."
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nareshkumarthota buildah not supported is misleading. Improve error message with something like:
ERROR: PERL not installed. Please install PERL to proceed.

exit 1
fi

if [ "$CDDFILE" != "na" -a "$EARFILE" != "na" ]; then
mkdir -p $TEMP_FOLDER
cp $CDDFILE $EARFILE $TEMP_FOLDER
CDDFILE="$TEMP_FOLDER/$CDD_FILE_NAME"
EARFILE="$TEMP_FOLDER/$EAR_FILE_NAME"
fi
INCLUDE_MODULES=$(docker run --rm -v .:/app -w /app $PERL_UTILITY_IMAGE_NAME perl -e 'require "./lib/be_container_optimize.pl"; print be_container_optimize::parse_optimize_modules("'$ARG_OPTIMIZE'","'$CDDFILE'","'$EARFILE'")')
fi
fi
fi

Expand Down Expand Up @@ -917,7 +956,11 @@ if [ "$IMAGE_NAME" = "$RMS_IMAGE" ]; then
fi

if ! [ "$INCLUDE_MODULES" = "na" ]; then
perl -e 'require "./lib/be_container_optimize.pl"; be_container_optimize::prepare_delete_list("'$INCLUDE_MODULES'","'$TEMP_FOLDER/lib/$DEL_LIST_FILE_NAME'")'
if [ "$PERL_UTILITY_CHECK" = "true" ]; then
perl -e 'require "./lib/be_container_optimize.pl"; be_container_optimize::prepare_delete_list("'$INCLUDE_MODULES'","'$TEMP_FOLDER/lib/$DEL_LIST_FILE_NAME'")'
else
docker run --rm -v .:/app -w /app $PERL_UTILITY_IMAGE_NAME perl -e 'require "./lib/be_container_optimize.pl"; be_container_optimize::prepare_delete_list("'$INCLUDE_MODULES'","'$TEMP_FOLDER/lib/$DEL_LIST_FILE_NAME'")'
fi
fi

if [ "$INSTALLATION_TYPE" != "fromlocal" ]; then
Expand Down Expand Up @@ -1200,6 +1243,14 @@ else
fi

if [ "$ARG_BUILD_TOOL" = "docker" ]; then

if [ "$PERL_UTILITY_CHECK" = "false" ]; then
if docker image inspect $PERL_UTILITY_IMAGE_NAME > /dev/null 2>&1; then
echo "INFO: Deleting temporary utility image."
docker rmi -f $PERL_UTILITY_IMAGE_NAME
fi
fi

if [ "$DOCKER_BUILDKIT" = 1 ]; then
docker builder prune -f
fi
Expand Down