Commit 23846f7c authored by J. Fernando Sánchez's avatar J. Fernando Sánchez
Browse files

New repository URL

parent 2483d9e6
...@@ -2,3 +2,4 @@ ...@@ -2,3 +2,4 @@
*.db *.db
__pycache__ __pycache__
lateralbackup.jsons lateralbackup.jsons
backup.jsons
NAME:=dashboard-somedi NAME:=dashboard-somedi
IMAGENAMEWEB:=registry.cluster.gsi.dit.upm.es/sefarad/dashboard-somedi/web IMAGENAMEWEB:=registry.cluster.gsi.dit.upm.es/social/somedi-lateral/web
IMAGENAME:=registry.cluster.gsi.dit.upm.es/sefarad/dashboard-somedi/gsicrawler IMAGENAME:=registry.cluster.gsi.dit.upm.es/social/somedi-lateral/gsicrawler
VERSIONFILE:=VERSION VERSIONFILE:=VERSION
include .makefiles/base.mk include .makefiles/base.mk
...@@ -17,4 +17,4 @@ build-latest: ## Build a specific version (e.g. build-2.7) ...@@ -17,4 +17,4 @@ build-latest: ## Build a specific version (e.g. build-2.7)
docker build -t '$(IMAGENAME):$(VERSION)' -f Dockerfile .; docker build -t '$(IMAGENAME):$(VERSION)' -f Dockerfile .;
push-latest: build-latest ## Push the "latest" tag to dockerhub push-latest: build-latest ## Push the "latest" tag to dockerhub
docker push '$(IMAGENAME):$(VERSION)' docker push '$(IMAGENAME):$(VERSION)'
\ No newline at end of file
...@@ -5,7 +5,7 @@ Installation ...@@ -5,7 +5,7 @@ Installation
Clone this repository and change to lateral-demo branch: Clone this repository and change to lateral-demo branch:
git clone https://lab.gsi.upm.es/sefarad/dashboard-somedi.git git clone https://lab.gsi.upm.es/social/somedi-lateral.git
Build and run the docker images: Build and run the docker images:
...@@ -18,7 +18,7 @@ Loading backup data ...@@ -18,7 +18,7 @@ Loading backup data
If you already have a list of analyzed posts you want to import into elasticsearch, you can do so with the loadBackup.py script. If you already have a list of analyzed posts you want to import into elasticsearch, you can do so with the loadBackup.py script.
For convenience, this script is included in the gsicrawler container. For convenience, this script is included in the gsicrawler container.
You just need to copy your backup file (a jsonlines file named `backup.jsons`) in the gsicrawler folder, and run this command: You just need to copy your backup file (a jsonlines file named `backup.jsons`) in the orchestrator folder, and run this command:
``` ```
docker-compose exec orchestrator python loadBackup.py docker-compose exec orchestrator python loadBackup.py
......
from node:7.10.0 from node:10
# Install gettext to get envsubst # Install gettext to get envsubst
RUN apt-get update && apt-get install -y gettext RUN apt-get update && apt-get install -y gettext
......
from node:7.10.0 from node:10
# Install gettext to get envsubst # Install gettext to get envsubst
RUN apt-get update && apt-get install -y gettext RUN apt-get update && apt-get install -y gettext
......
...@@ -2,18 +2,18 @@ version: '2.1' ...@@ -2,18 +2,18 @@ version: '2.1'
services: services:
sefarad: sefarad:
build: ./dashboard/ build: ./dashboard/
image: registry.cluster.gsi.dit.upm.es/sefarad/dashboard-somedi/web:${VERSION} image: registry.cluster.gsi.dit.upm.es/social/somedi-lateral/web:${VERSION}
ports: ports:
- "8080:8080" - "8080:8080"
environment: environment:
- ES_ENDPOINT_EXTERNAL=${ES_ENDPOINT_EXTERNAL} - ES_ENDPOINT_EXTERNAL=${ES_ENDPOINT_EXTERNAL}
- FUSEKI_ENDPOINT_EXTERNAL=${FUSEKI_ENDPOINT_EXTERNAL} - FUSEKI_ENDPOINT_EXTERNAL=${FUSEKI_ENDPOINT_EXTERNAL}
orchestrator: orchestrator:
image: registry.cluster.gsi.dit.upm.es/social/somedi/orchestrator:${VERSION} image: registry.cluster.gsi.dit.upm.es/social/somedi-lateral/orchestrator:${VERSION}
build: ./orchestrator build: ./orchestrator
volumes: volumes:
- "./orchestrator/tasks.py:/soneti/tasks.py" - "./orchestrator/tasks.py:/soneti/tasks.py"
- "./backup.jsons:/soneti/backupjsons" - "./backup.jsons:/soneti/backup.jsons"
ports: ports:
- "8082:8082" - "8082:8082"
environment: environment:
......
...@@ -28,7 +28,7 @@ spec: ...@@ -28,7 +28,7 @@ spec:
spec: spec:
containers: containers:
- name: gsicrawler - name: gsicrawler
image: registry.cluster.gsi.dit.upm.es/sefarad/dashboard-somedi/gsicrawler:${VERSION} image: registry.cluster.gsi.dit.upm.es/social/somedi-lateral/orchestrator:${VERSION}
imagePullPolicy: Always imagePullPolicy: Always
resources: resources:
limits: limits:
...@@ -63,7 +63,7 @@ spec: ...@@ -63,7 +63,7 @@ spec:
spec: spec:
containers: containers:
- name: ${NAME} - name: ${NAME}
image: registry.cluster.gsi.dit.upm.es/sefarad/dashboard-somedi/web:${VERSION} image: registry.cluster.gsi.dit.upm.es/social/somedi-lateral/web:${VERSION}
imagePullPolicy: Always imagePullPolicy: Always
resources: resources:
limits: limits:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment