From c3a668879d2ef64b28508994c1e8584863b260ad Mon Sep 17 00:00:00 2001 From: Mirco Nasuti <mirco.nasuti@chuv.ch> Date: Thu, 4 Aug 2016 16:37:03 +0200 Subject: [PATCH] removed files containing private data and should only be used in development environment --- build.sh | 5 ---- captain_run.sh | 35 -------------------------- clean.sh | 6 ----- config/application.yml | 53 ---------------------------------------- docker-compose.yml | 44 --------------------------------- docker-compose_build.yml | 11 --------- go.sh | 4 --- halt.sh | 4 --- log.sh | 3 --- run.sh | 12 --------- 10 files changed, 177 deletions(-) delete mode 100755 build.sh delete mode 100755 captain_run.sh delete mode 100755 clean.sh delete mode 100644 config/application.yml delete mode 100644 docker-compose.yml delete mode 100644 docker-compose_build.yml delete mode 100755 go.sh delete mode 100755 halt.sh delete mode 100755 log.sh delete mode 100755 run.sh diff --git a/build.sh b/build.sh deleted file mode 100755 index cf8f6c9e9..000000000 --- a/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -./halt.sh -docker-compose -f ./docker-compose_build.yml build -docker-compose -f ./docker-compose_build.yml run --rm portal-backend-build diff --git a/captain_run.sh b/captain_run.sh deleted file mode 100755 index f1b9f8af2..000000000 --- a/captain_run.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env bash - -if [ $(docker ps | grep portal-db | wc -l) -gt 0 ]; then - docker kill portal-db -fi -if [ $(docker ps -a | grep portal-db | wc -l) -gt 0 ]; then - docker rm -f portal-db -fi - -if [ $(docker ps | grep portal-backend | wc -l) -gt 0 ]; then - docker kill portal-backend -fi -if [ $(docker ps -a | grep portal-backend | wc -l) -gt 0 ]; then - docker rm -f portal-backend -fi - -docker run --name portal-db -p 5432:5432 -e POSTGRES_USER=postgres -d postgres - -echo "Waiting for DB to start..." -until [ $(docker exec portal-db psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do - printf '.' - sleep 1 -done - -docker run --name portal-backend -p 8080:8080 \ --e "AUTHENTICATION=1" \ --e "CLIENT_SECRET=aD0Tueb3KkNkcZqZgQbNyDWgnM95IfZ0xPCQ_6Z9dQNHXY00RIrnAD_m7sNJh1oofYSX8aHkl72MkwI0K626Ug" \ --e "FRONTEND_REDIRECT_URL=http://localhost/home" \ --d hbpmip/portal-backend - -echo "Waiting for backend to start..." -until [ $(docker logs portal-backend | grep "Started MIPApplication" | wc -l) -eq 1 ]; do - printf '.' - sleep 1 -done diff --git a/clean.sh b/clean.sh deleted file mode 100755 index 094693297..000000000 --- a/clean.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -./halt.sh -sudo rm -rf ./.m2/ -sudo rm -rf ./target/ -sudo rm -rf ./pgdata/ \ No newline at end of file diff --git a/config/application.yml b/config/application.yml deleted file mode 100644 index 0a072a4e2..000000000 --- a/config/application.yml +++ /dev/null @@ -1,53 +0,0 @@ -# Configuration template for the portal running inside a Docker container - -spring: - datasource: - url: jdbc:postgresql://172.22.0.1:5432/postgres - username: postgres - password: pass - driver-class-name: org.postgresql.Driver - jpa: - hibernate: - dialect: org.hibernate.dialect.PostgreSQL9Dialect - resources: - chain: - enabled: true - -security: - enabled: false - -hbp: - client: - clientId: 996f97c5-a3ca-460e-b18b-00df3e2be89a - clientSecret: aD0Tueb3KkNkcZqZgQbNyDWgnM95IfZ0xPCQ_6Z9dQNHXY00RIrnAD_m7sNJh1oofYSX8aHkl72MkwI0K626Ug - accessTokenUri: https://services.humanbrainproject.eu/oidc/token - userAuthorizationUri: https://services.humanbrainproject.eu/oidc/authorize - tokenName: oauth_token - authenticationScheme: query - clientAuthenticationScheme: form - resource: - userInfoUri: https://services.humanbrainproject.eu/oidc/userinfo - -logging: - level: - org.springframework.security: DEBUG - -server: - contextPath: /services - port: 8080 - use-forward-headers: true - session: - timeout: 2592000 - -workflow: - experimentUrl: http://172.22.0.1:8087/experiment - listMethodsUrl: http://172.22.0.1:8087/list-methods - miningMipUrl: http://172.22.0.1:8087/mining - miningExaremeUrl: http://hbps2.chuv.ch:9090/mining/query - -frontend: - redirect: - url: http://frontend/home - -authentication: - enabled: 0 diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 69eafc9e4..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: '2' - -services: - portal-backend: - container_name: portal-backend - build: - context: . - dockerfile: ./src/docker/run/Dockerfile - depends_on: - - "portal-db" - ports: - - "8080:8080" - links: - - "portal-db" - environment: - DB_URL: jdbc:postgresql://portal-db:5432/postgres - DB_USER: postgres - DB_PASS: pass - CLIENT_ID: 996f97c5-a3ca-460e-b18b-00df3e2be89a - CLIENT_SECRET: aD0Tueb3KkNkcZqZgQbNyDWgnM95IfZ0xPCQ_6Z9dQNHXY00RIrnAD_m7sNJh1oofYSX8aHkl72MkwI0K626Ug - TOKEN_URI: https://services.humanbrainproject.eu/oidc/token - AUTH_URI: https://services.humanbrainproject.eu/oidc/authorize - USER_INFO_URI: https://services.humanbrainproject.eu/oidc/userinfo - LOGGING_LEVEL: DEBUG - CONTEXT_PATH: /services - PORT: 8080 - SESSION_TIMEOUT: 2592000 - EXPERIMENT_URL: http://backend-ml:8087/experiment - LIST_METHODS_URL: http://backend-ml:8087/list-methods - ML_URL: http://172.22.0.1:8087/mining - EXAREME_URL: http://hbps2.chuv.ch:9090/mining/query - FRONTEND_REDIRECT_URL: http://frontend/home - AUTHENTICATION: 1 - - portal-db: - container_name: portal-db - image: postgres:9.5.3 - ports: - - "5432:5432" - volumes: - - ./pgdata:/var/lib/postgresql/data/pgdata - environment: - POSTGRES_USER: postgres - PGDATA: /var/lib/postgresql/data/pgdata diff --git a/docker-compose_build.yml b/docker-compose_build.yml deleted file mode 100644 index 11fc33837..000000000 --- a/docker-compose_build.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: '2' - -services: - portal-backend-build: - container_name: portal-backend-build - build: ./src/docker/build/ - volumes: - - ./:/opt/portal/ - - .m2:/root/.m2/ - ports: - - "8080:8080" diff --git a/go.sh b/go.sh deleted file mode 100755 index 2d044fe98..000000000 --- a/go.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -./build.sh -./run.sh diff --git a/halt.sh b/halt.sh deleted file mode 100755 index 7b9c9e76a..000000000 --- a/halt.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -docker-compose kill -docker-compose rm -f diff --git a/log.sh b/log.sh deleted file mode 100755 index f1cd4924d..000000000 --- a/log.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -docker-compose logs -f backend diff --git a/run.sh b/run.sh deleted file mode 100755 index 29c1f9f3b..000000000 --- a/run.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -docker-compose build -docker-compose up -d portal-db - -echo "Waiting for database to be ready..." -until [ $(docker-compose exec portal-db psql -U postgres -c "\q" 2>&1 | wc -l) -eq 0 ]; do - printf '.' - sleep 1 -done - -docker-compose up -d portal-backend -- GitLab