Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
chore(salsah1): delete from repository (#1805)(DSP-1294)
  • Loading branch information
subotic committed Feb 1, 2021
1 parent e411580 commit 3251a74
Show file tree
Hide file tree
Showing 3,023 changed files with 7 additions and 80,562 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
35 changes: 7 additions & 28 deletions Makefile
Expand Up @@ -69,19 +69,11 @@ docker-build-knora-sipi-image: # build and publish knora-sipi docker image local
docker-publish-knora-sipi-image: # publish knora-sipi image to Dockerhub
@bazel run //docker/knora-sipi:push

.PHONY: docker-build-knora-salsah1-image
docker-build-knora-salsah1-image: # build and publish knora-salsah1 docker image locally
@bazel run //docker/knora-salsah1:image

.PHONY: docker-publish-knora-salsah1-image
docker-publish-knora-salsah1-image: # publish knora-salsah1 image to Dockerhub
@bazel run //docker/knora-salsah1:push

.PHONY: docker-build
docker-build: docker-build-knora-api-image docker-build-knora-jena-fuseki-image docker-build-knora-sipi-image docker-build-knora-salsah1-image ## build and publish all Docker images locally
docker-build: docker-build-knora-api-image docker-build-knora-jena-fuseki-image docker-build-knora-sipi-image ## build and publish all Docker images locally

.PHONY: docker-publish
docker-publish: docker-publish-knora-api-image docker-publish-knora-jena-fuseki-image docker-publish-knora-sipi-image docker-publish-knora-salsah1-image ## publish all Docker images to Dockerhub
docker-publish: docker-publish-knora-api-image docker-publish-knora-jena-fuseki-image docker-publish-knora-sipi-image ## publish all Docker images to Dockerhub

#################################
## Docker-Compose targets
Expand Down Expand Up @@ -114,7 +106,7 @@ endif
#################################

.PHONY: stack-up
stack-up: docker-build env-file ## starts the knora-stack: fuseki, sipi, redis, api, salsah1.
stack-up: docker-build env-file ## starts the knora-stack: fuseki, sipi, redis, api.
docker-compose -f docker-compose.yml up -d db
$(CURRENT_DIR)/webapi/scripts/wait-for-db.sh
docker-compose -f docker-compose.yml up -d
Expand All @@ -126,11 +118,11 @@ stack-up-fast: docker-build-knora-api-image env-file ## starts the knora-stack b

.PHONY: stack-up-ci
stack-up-ci: KNORA_DB_REPOSITORY_NAME := knora-test-unit
stack-up-ci: docker-build env-file print-env-file ## starts the knora-stack using 'knora-test-unit' repository: fuseki, sipi, redis, api, salsah1.
stack-up-ci: docker-build env-file print-env-file ## starts the knora-stack using 'knora-test-unit' repository: fuseki, sipi, redis, api.
docker-compose -f docker-compose.yml up -d

.PHONY: stack-restart
stack-restart: stack-up ## re-starts the knora-stack: fuseki, sipi, redis, api, salsah1.
stack-restart: stack-up ## re-starts the knora-stack: fuseki, sipi, redis, api.
@docker-compose -f docker-compose.yml restart

.PHONY: stack-restart-api
Expand Down Expand Up @@ -170,10 +162,6 @@ stack-logs-api: ## prints out and follows the logs of the 'api' container runnin
stack-logs-api-no-follow: ## prints out the logs of the 'api' container running in knora-stack.
docker-compose -f docker-compose.yml logs api

.PHONY: stack-logs-salsah1
stack-logs-salsah1: ## prints out and follows the logs of the 'salsah1' container running in knora-stack.
docker-compose -f docker-compose.yml logs -f salsah1

.PHONY: stack-health
stack-health:
curl -f 0.0.0.0:3333/health
Expand All @@ -196,19 +184,14 @@ stack-config: env-file

## stack without api
.PHONY: stack-without-api
stack-without-api: stack-up ## starts the knora-stack without knora-api: fuseki, sipi, redis, salsah1.
stack-without-api: stack-up ## starts the knora-stack without knora-api: fuseki, sipi, redis.
@docker-compose -f docker-compose.yml stop api

.PHONY: stack-without-api-and-sipi
stack-without-api-and-sipi: stack-up ## starts the knora-stack without knora-api and sipi: fuseki, redis, salsah1.
stack-without-api-and-sipi: stack-up ## starts the knora-stack without knora-api and sipi: fuseki, redis.
@docker-compose -f docker-compose.yml stop api
@docker-compose -f docker-compose.yml stop sipi

.PHONY: stack-without-api-and-salsah1
stack-without-api-and-salsah1: stack-up ## starts the knora-stack without knora-api and salsah1: fuseki, redis, sipi.
@docker-compose -f docker-compose.yml stop api
@docker-compose -f docker-compose.yml stop salsah1

.PHONY: stack-db-only
stack-db-only: docker-build-knora-jena-fuseki-image env-file ## starts only fuseki.
docker-compose -f docker-compose.yml up -d db
Expand Down Expand Up @@ -253,10 +236,6 @@ client-test-data: docker-build ## runs the dsp-api e2e tests and generates clien
test-it: docker-build ## runs the dsp-api integration tests.
bazel test //webapi/src/test/scala/org/knora/webapi/it/...

.PHONY: test-salsah1
test-salsah1: docker-build ## runs salsah1 headless browser tests
bazel test //salsah1/...

.PHONY: test-repository-upgrade
test-repository-upgrade: init-db-test-minimal ## runs DB upgrade integration test
@rm -rf $(CURRENT_DIR)/.tmp/knora-test-data/v7.0.0/
Expand Down
12 changes: 0 additions & 12 deletions docker-compose.yml
Expand Up @@ -65,18 +65,6 @@ services:
- KNORA_WEBAPI_CACHE_SERVICE_REDIS_PORT=6379
- KNORA_WEBAPI_ALLOW_RELOAD_OVER_HTTP=true

salsah1:
image: bazel/docker/knora-salsah1:image
ports:
- "3335:3335"
networks:
- knora-net
environment:
- KNORA_SALSAH1_HOSTNAME=0.0.0.0
- KNORA_SALSAH1_PORT=3335
- KNORA_SALSAH1_WEBAPI=http://0.0.0.0:3333
- KNORA_SALSAH1_SIPI=http://0.0.0.0:1024

networks:
knora-net:
name: knora-net
Expand Down
48 changes: 0 additions & 48 deletions docker/knora-salsah1/BUILD.bazel

This file was deleted.

47 changes: 0 additions & 47 deletions docs/06-salsah/index.md

This file was deleted.

1 change: 0 additions & 1 deletion docs/index.md
Expand Up @@ -22,7 +22,6 @@ License along with Knora. If not, see <http://www.gnu.org/licenses/>.
* [Knora APIs](03-apis/index.md)
* [Publishing and Deployment](04-publishing-deployment/index.md)
* [Knora Internals](05-internals/design/principles/index.md)
* [Salsah](06-salsah/index.md)
* [Sipi](07-sipi/index.md)
* [Lucene](08-lucene/index.md)
* [Frequently Asked Questions](faq/index.md)
Expand Down
4 changes: 0 additions & 4 deletions salsah1/.dockerignore

This file was deleted.

3 changes: 0 additions & 3 deletions salsah1/.gitignore

This file was deleted.

105 changes: 0 additions & 105 deletions salsah1/BUILD.bazel

This file was deleted.

27 changes: 0 additions & 27 deletions salsah1/lib/chromedriver/LICENSE

This file was deleted.

Binary file removed salsah1/lib/chromedriver/chromedriver_linux32.zip
Binary file not shown.
Binary file removed salsah1/lib/chromedriver/chromedriver_linux64.zip
Binary file not shown.
Binary file removed salsah1/lib/chromedriver/chromedriver_mac64.zip
Binary file not shown.
Binary file removed salsah1/lib/chromedriver/chromedriver_win32.zip
Binary file not shown.

0 comments on commit 3251a74

Please sign in to comment.