hasuracli dockerfile and migration scripts moved to compose dir, disa…

…ble docker login if credentials not configured
BBVA · May 14, 2019 · 002fc99 · 002fc99
1 parent 270f204
commit 002fc99
Show file tree

Hide file tree

Showing 22 changed files with 4 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -37,4 +37,6 @@ $(buildbot_plugins):
 	$(MAKE) --directory=$@
 
 docker_login:
+ifdef DOCKER_USER
 	docker login -u $${DOCKER_USER} -p $${DOCKER_PASS}
+endif
diff --git a/Dockerfile.hasuracli → compose/Dockerfile.hasuracli b/Dockerfile.hasuracli → compose/Dockerfile.hasuracli
diff --git a/compose/docker-compose.yaml b/compose/docker-compose.yaml
@@ -54,10 +54,10 @@ services:
 
   hasura-migrate:
     build:
-      dockerfile: ../Dockerfile.hasuracli
+      dockerfile: Dockerfile.hasuracli
       context: .
     command: /bin/sh -c "sleep 10 && cd /hasura && /go/bin/hasura migrate apply"
     depends_on:
       - deeptracy-server
     volumes:
-      - ../hasura:/hasura
+      - ./hasura:/hasura
diff --git a/hasura/config.yaml → compose/hasura/config.yaml b/hasura/config.yaml → compose/hasura/config.yaml
diff --git a/...l_existing_table_or_view_public.down.yaml → ...l_existing_table_or_view_public.down.yaml b/...l_existing_table_or_view_public.down.yaml → ...l_existing_table_or_view_public.down.yaml
diff --git a/...all_existing_table_or_view_public.up.yaml → ...all_existing_table_or_view_public.up.yaml b/...all_existing_table_or_view_public.up.yaml → ...all_existing_table_or_view_public.up.yaml
diff --git a/...ip_target_table_public_analysis.down.yaml → ...ip_target_table_public_analysis.down.yaml b/...ip_target_table_public_analysis.down.yaml → ...ip_target_table_public_analysis.down.yaml
diff --git a/...ship_target_table_public_analysis.up.yaml → ...ship_target_table_public_analysis.up.yaml b/...ship_target_table_public_analysis.up.yaml → ...ship_target_table_public_analysis.up.yaml
diff --git a/...allations_table_public_analysis.down.yaml → ...allations_table_public_analysis.down.yaml b/...allations_table_public_analysis.down.yaml → ...allations_table_public_analysis.down.yaml
diff --git a/...stallations_table_public_analysis.up.yaml → ...stallations_table_public_analysis.up.yaml b/...stallations_table_public_analysis.up.yaml → ...stallations_table_public_analysis.up.yaml
diff --git a/...allations_table_public_artifact.down.yaml → ...allations_table_public_artifact.down.yaml b/...allations_table_public_artifact.down.yaml → ...allations_table_public_artifact.down.yaml
diff --git a/...stallations_table_public_artifact.up.yaml → ...stallations_table_public_artifact.up.yaml b/...stallations_table_public_artifact.up.yaml → ...stallations_table_public_artifact.up.yaml
diff --git a/...abilities_table_public_artifact.down.yaml → ...abilities_table_public_artifact.down.yaml b/...abilities_table_public_artifact.down.yaml → ...abilities_table_public_artifact.down.yaml
diff --git a/...erabilities_table_public_artifact.up.yaml → ...erabilities_table_public_artifact.up.yaml b/...erabilities_table_public_artifact.up.yaml → ...erabilities_table_public_artifact.up.yaml
diff --git a/...lysis_table_public_installation.down.yaml → ...lysis_table_public_installation.down.yaml b/...lysis_table_public_installation.down.yaml → ...lysis_table_public_installation.down.yaml
diff --git a/...nalysis_table_public_installation.up.yaml → ...nalysis_table_public_installation.up.yaml b/...nalysis_table_public_installation.up.yaml → ...nalysis_table_public_installation.up.yaml
diff --git a/...ifact_table_public_installation.down.yaml → ...ifact_table_public_installation.down.yaml b/...ifact_table_public_installation.down.yaml → ...ifact_table_public_installation.down.yaml
diff --git a/...rtifact_table_public_installation.up.yaml → ...rtifact_table_public_installation.up.yaml b/...rtifact_table_public_installation.up.yaml → ...rtifact_table_public_installation.up.yaml
diff --git a/...ip_analyses_table_public_target.down.yaml → ...ip_analyses_table_public_target.down.yaml b/...ip_analyses_table_public_target.down.yaml → ...ip_analyses_table_public_target.down.yaml
diff --git a/...ship_analyses_table_public_target.up.yaml → ...ship_analyses_table_public_target.up.yaml b/...ship_analyses_table_public_target.up.yaml → ...ship_analyses_table_public_target.up.yaml
diff --git a/...fact_table_public_vulnerability.down.yaml → ...fact_table_public_vulnerability.down.yaml b/...fact_table_public_vulnerability.down.yaml → ...fact_table_public_vulnerability.down.yaml
diff --git a/...tifact_table_public_vulnerability.up.yaml → ...tifact_table_public_vulnerability.up.yaml b/...tifact_table_public_vulnerability.up.yaml → ...tifact_table_public_vulnerability.up.yaml