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.

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

Removed kubernetes/, and merged the two docker-compose below docker/ #569

Merged
merged 2 commits into from
Sep 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,5 @@ docs
.git
.vscode
findbugs-exclude.xml
kubernetes
.gradle
.gradle_home
26 changes: 13 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ bin/
/.metadata/
out/
gradle.zip
/docker/**/*.*ar
/docker/.env
/docker/data
/docker/client-components
/.vscode
lang-java-reach-soot-init/lib/*.jar
docs/site
Expand All @@ -33,16 +29,20 @@ docs/.tmp
/*/src/main/webapp/model/Version.js
values_dev.yaml
test.yaml
kubernetes/helm/vulnerability-assessment-tool-admin/charts/nginx-ingress/files/tls/*.key
kubernetes/helm/vulnerability-assessment-tool-admin/charts/nginx-ingress/files/tls/*.crt
/kubernetes/kustomize/secrets/*
!/kubernetes/kustomize/secrets/*.sample
/docker/**/import_vulas_kb.sh
google-java-format-*.jar
.DS_Store
docker/kb-importer/data/**
**/*.buildinfo
docker/kb-importer/data/**

# Created by the generator Docker container (/docker/Dockerfile and /docker/run.sh)
/docker/**/*.*ar
/docker/client-components
/docker/all-components

# Environment and data folders when running the Docker Compose app in the cloned repo
/docker/.env
/docker/*/data
/docker/kb-importer/conf/kaybeeconf.yaml

# Files created by .travis/check_code_style.sh
google-java-format-*.jar
java-files.txt
non-compliant-files.txt
non-compliant-files.txt
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Upstream-Name: steady
Upstream-Contact: Henrik Plate
Source: https://github.com/eclipse/steady

Files: .github/* .travis/* cli-scanner/* docker/* docs/* frontend-apps/* frontend-bugs/* kb-importer/* kubernetes/* lang/* lang-java/* lang-java-reach/* lang-java-reach-soot/* lang-java-reach-wala/* lang-python/* patch-analyzer/* patch-lib-analyzer/* plugin-gradle/* plugin-maven/* repo-client/* rest-backend/* rest-lib-utils/* shared/* .dockerignore .gitignore .travis.yml CONTRIBUTING.md CONTRIBUTORS.md findbugs-exclude.xml findbugs-include.xml README.md requirements.txt SECURITY.md Jenkinsfile .pipeline/*
Files: .github/* .travis/* cli-scanner/* docker/* docs/* frontend-apps/* frontend-bugs/* kb-importer/* lang/* lang-java/* lang-java-reach/* lang-java-reach-soot/* lang-java-reach-wala/* lang-python/* patch-analyzer/* patch-lib-analyzer/* plugin-gradle/* plugin-maven/* repo-client/* rest-backend/* rest-lib-utils/* shared/* .dockerignore .gitignore .travis.yml CONTRIBUTING.md CONTRIBUTORS.md findbugs-exclude.xml findbugs-include.xml README.md requirements.txt SECURITY.md Jenkinsfile .pipeline/*
Copyright: 2018-2021 SAP SE or an SAP affiliate company and Eclipse Steady contributors
License: Apache-2.0

Expand Down
3 changes: 0 additions & 3 deletions bump-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,3 @@ if [ -z $is_snap ]; then
sed -i "" "s/${old_doc}/${new}/" docker/start-steady.sh
sed -i "" "s/${old_doc}/${new}/" docker/.env.sample
fi

# Kubernetes doc files
find kubernetes -name README.md -exec sed -i "" "s/${old}/${new}/" {} \;
File renamed without changes.
181 changes: 0 additions & 181 deletions docker/docker-compose-new.yml

This file was deleted.

Loading