Merge pull request #569 from eclipse/docker-compose

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

.dockerignore

@@ -8,6 +8,5 @@ docs
 .git
 .vscode
 findbugs-exclude.xml
-kubernetes
 .gradle
 .gradle_home

.gitignore

@@ -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
@@ -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

.reuse/dep5

@@ -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
 

bump-version.sh

@@ -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}/" {} \;