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

Minor updates to docker setup #532

Merged
merged 9 commits into from
Jan 28, 2022
Merged

Minor updates to docker setup #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
211f543
removed running flag and pypi from cia config
serenaponta Jan 25, 2022
d7af4d9
reverted substitution
serenaponta Jan 27, 2022
f5d6e56
actually remove running flag
serenaponta Jan 27, 2022
c0f9977
changed cron config to hour only
serenaponta Jan 27, 2022
7b8ea7c
remove backward compatible file
serenaponta Jan 27, 2022
98e24da
readd needed substitution
serenaponta Jan 27, 2022
25434b9
removed PypiWrapper from rest-lib-utils SPI
serenaponta Jan 27, 2022
abe938b
keep python in cia tests
serenaponta Jan 27, 2022
1a85efd
updated setup-steady
serenaponta Jan 28, 2022
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
2 changes: 1 addition & 1 deletion docker/.env.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ https_proxy=
no_proxy=

# kb-importer update cron expression
KB_IMPORTER_CRON=0 0 * * *
KB_IMPORTER_CRON_HOUR=0
KB_IMPORTER_STATEMENTS_FOLDER=statements
KB_IMPORTER_STATEMENTS_REPO=https://github.com/sap/project-kb
KB_IMPORTER_STATEMENTS_BRANCH=vulnerability-data
Expand Down
254 changes: 0 additions & 254 deletions docker/kb-importer/conf/kaybeeconf.yaml
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions docker/kb-importer/kb-importer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ construct_kaybee_pull_folder(){
echo ${HOST}_${PATH}
}

if [ ! -f /kb-importer/data/running ]
then
touch /kb-importer/data/running
#if [ ! -f /kb-importer/data/running ]
#then
# touch /kb-importer/data/running

#kaybee update
cd /kb-importer/data
Expand All @@ -41,7 +41,7 @@ then
chmod +x steady.sh
./steady.sh
echo `date` " Kaybee Import Done"
rm /kb-importer/data/running
else
echo `date` " Kaybee Import already Running"
fi
# rm /kb-importer/data/running
#else
# echo `date` " Kaybee Import already Running"
#fi
4 changes: 2 additions & 2 deletions docker/kb-importer/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ sleep 40
crontab -l > tmpcron
if ! cat tmpcron | grep "kb-importer.sh"
then
if [ -z "$KB_IMPORTER_CRON" ]
if [ -z "$KB_IMPORTER_CRON_HOUR" ]
then
echo "0 0 * * * PATH=$PATH BACKEND_SERVICE_URL=$BACKEND_SERVICE_URL KB_IMPORTER_STATEMENTS_FOLDER=$KB_IMPORTER_STATEMENTS_FOLDER KB_IMPORTER_STATEMENTS_BRANCH=$KB_IMPORTER_STATEMENTS_BRANCH KB_IMPORTER_STATEMENTS_REPO=$KB_IMPORTER_STATEMENTS_REPO KB_IMPORTER_CLONE_FOLDER=$KB_IMPORTER_CLONE_FOLDER KB_IMPORTER_SKIP_CLONE=$KB_IMPORTER_SKIP_CLONE /kb-importer/kb-importer.sh >> /kb-importer/cron.log 2>&1" >> tmpcron
else
echo "$KB_IMPORTER_CRON" " PATH=$PATH BACKEND_SERVICE_URL=$BACKEND_SERVICE_URL KB_IMPORTER_STATEMENTS_FOLDER=$KB_IMPORTER_STATEMENTS_FOLDER KB_IMPORTER_STATEMENTS_BRANCH=$KB_IMPORTER_STATEMENTS_BRANCH KB_IMPORTER_STATEMENTS_REPO=$KB_IMPORTER_STATEMENTS_REPO KB_IMPORTER_CLONE_FOLDER=$KB_IMPORTER_CLONE_FOLDER KB_IMPORTER_SKIP_CLONE=$KB_IMPORTER_SKIP_CLONE /kb-importer/kb-importer.sh >> /kb-importer/cron.log 2>&1" >> tmpcron
echo "0 " "$KB_IMPORTER_CRON_HOUR" " * * * PATH=$PATH BACKEND_SERVICE_URL=$BACKEND_SERVICE_URL KB_IMPORTER_STATEMENTS_FOLDER=$KB_IMPORTER_STATEMENTS_FOLDER KB_IMPORTER_STATEMENTS_BRANCH=$KB_IMPORTER_STATEMENTS_BRANCH KB_IMPORTER_STATEMENTS_REPO=$KB_IMPORTER_STATEMENTS_REPO KB_IMPORTER_CLONE_FOLDER=$KB_IMPORTER_CLONE_FOLDER KB_IMPORTER_SKIP_CLONE=$KB_IMPORTER_SKIP_CLONE /kb-importer/kb-importer.sh >> /kb-importer/cron.log 2>&1" >> tmpcron
fi
fi
crontab tmpcron
Expand Down
1 change: 0 additions & 1 deletion docker/setup-steady.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ setup (){
curl -s https://raw.githubusercontent.com/eclipse/steady/$TAG/docker/postgresql/docker-entrypoint-initdb.d/10-vulas-setup.sh -o ./$DIR/conf/postgresql/10-vulas-setup.sh
curl -s https://raw.githubusercontent.com/eclipse/steady/$TAG/docker/cache/nginx.conf -o ./$DIR/conf/cache/nginx.conf
curl -s https://raw.githubusercontent.com/eclipse/steady/$TAG/docker/kb-importer/conf/kaybeeconf.yaml.sample -o ./$DIR/conf/kb-importer/kaybeeconf.yaml.sample
curl -s https://raw.githubusercontent.com/eclipse/steady/$TAG/docker/kb-importer/conf/kaybeeconf.yaml -o ./$DIR/conf/kb-importer/kaybeeconf.yaml
curl -s https://raw.githubusercontent.com/eclipse/steady/$TAG/docker/rest-backend/conf/restbackend.properties -o ./$DIR/conf/rest-backend/restbackend.properties

# Create default configuration in user's home directory
Expand Down
2 changes: 1 addition & 1 deletion ...-utils/src/main/resources/META-INF/services/org.eclipse.steady.cia.util.RepositoryWrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.eclipse.steady.cia.util.MavenCentralWrapper
org.eclipse.steady.cia.util.NexusWrapper
org.eclipse.steady.cia.util.PypiWrapper
#org.eclipse.steady.cia.util.PypiWrapper
3 changes: 2 additions & 1 deletion rest-lib-utils/src/main/resources/steady-rest-lib-utils.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ vulas.lib-utils.mavencentral.retrycount=3
vulas.lib-utils.mavencentral.retrydelay=10000

# End point to query/retrieve artifacts from Pypi
# Default:
# Default:
vulas.lib-utils.pypi.search=https://pypi.org/pypi/



# IMPORTANT
#
# The following settings are specific to the deployment of Vulas in a given environment.
Expand Down
3 changes: 3 additions & 0 deletions ...-utils/src/test/resources/META-INF/services/org.eclipse.steady.cia.util.RepositoryWrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
org.eclipse.steady.cia.util.MavenCentralWrapper
org.eclipse.steady.cia.util.NexusWrapper
org.eclipse.steady.cia.util.PypiWrapper