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

change mend script #59

Merged
merged 2 commits into from
Jan 24, 2024
Merged

change mend script #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
283f89e
change mend script
kevin-ortega Jan 22, 2024
5ac1a78
Remove debug
kevin-ortega Jan 24, 2024
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
4 changes: 2 additions & 2 deletions .one-pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ containerize:
done < <(list_artifacts)

echo "MEND unified agent scan"
chmod +x "${COMMONS_PATH}/whitesource/whitesource_unified_agent_scan.sh"
source "${COMMONS_PATH}/whitesource/whitesource_unified_agent_scan.sh"
chmod +x "${COMMONS_PATH}"/mend/mend_unified_agent_scan.sh
source "${COMMONS_PATH}"/mend/mend_unified_agent_scan.sh



Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PROD_NAMESPACE?=ibmcom
PLATFORM=websphere-liberty-s2i
IMAGE_NAME=${NAMESPACE}/${PLATFORM}
BUILD_IMAGE_NAME=${PROD_NAMESPACE}/${PLATFORM}
DOCKER_HOST=tcp://localhost:2376
#DOCKER_HOST=tcp://localhost:2376

build = ./build.sh

Expand Down
8 changes: 3 additions & 5 deletions modules/maven/module.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ schema_version: 1

name: maven
version: 1.0
description: "Module used to install Maven 3.9.3"
description: "Module used to install Maven 3.8.8"

# Defined artifacts that are used to build the image
artifacts:
- name: maven.tar.gz
url: https://www.apache.org/dist/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
sha512: 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00

url: https://downloads.apache.org/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz
sha512: 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
execute:
- script: install.sh

6 changes: 3 additions & 3 deletions test/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ run_test_application() {

cleanupContainer() {
echo "Cleanup for test, cid $(cat $cid_file)"
if container_exists; then
if container_exists; then
if [[ $1 != "0" ]]; then
echo "Viewing docker logs"
docker logs $(cat $cid_file)
Expand All @@ -89,15 +89,15 @@ cleanupContainer() {
rm -f $cid_file
}

cleanupImages() {
cleanupImages() {
if image_exists ${BUILD_IMAGE_NAME}-testapp; then
docker rmi -f ${BUILD_IMAGE_NAME}-testapp
fi
if image_exists ${BUILD_IMAGE_NAME}-runtime-testapp; then
docker rmi -f ${BUILD_IMAGE_NAME}-runtime-testapp
fi
rm -rf ${test_dir}/test-app/.git

}

cleanupFinal() {
Expand Down
Loading