diff --git a/.gitignore b/.gitignore index 832e582..9137c55 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,13 @@ cmd/server/var/ # vscode project dir .vscode/ + +# Compiled binary +cmd/server/server + +# host storage for container +minio-data/ +postgres-data/ + +# Scratch space +scratch/ diff --git a/README.md b/README.md index 3e8f732..489e353 100644 --- a/README.md +++ b/README.md @@ -158,3 +158,19 @@ The steps: owner | repo -------+--------- foo | foo/bar + +### Use the minio ql db + +1. Web access via + + open http://localhost:9001/login + + username / password are in `docker-compose.yml` for now. The ql db listing + will be at + + http://localhost:9001/browser/qldb + +1. The names use `owner_repo` format for now, e.g. `google_flatbuffers_db.zip`. + TODO This will be enhanced to include other data later + + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e8a5e03..fe56dc0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: POSTGRES_PASSWORD: examplepass POSTGRES_DB: exampledb volumes: - - postgres_data:/var/lib/postgresql/data + - ./postgres-data:/var/lib/postgresql/data - ./postgres-init-scripts:/docker-entrypoint-initdb.d ports: - "5432:5432" # Exposing PostgreSQL to the host @@ -33,17 +33,17 @@ services: networks: - backend - server: image: server-image container_name: server + stop_grace_period: 1s # Reduce the timeout period for testing environment: - MRVA_SERVER_ROOT=/mrva/mrvacommander/cmd/server command: sh -c "tail -f /dev/null" ports: - "8080:8080" volumes: - - /Users/hohn/work-gh/mrva/mrvacommander:/mrva/mrvacommander + - ./:/mrva/mrvacommander depends_on: - postgres - rabbitmq @@ -58,15 +58,17 @@ services: - "9001:9001" environment: MINIO_ROOT_USER: user - MINIO_ROOT_PASSWORD: musty-coke + MINIO_ROOT_PASSWORD: mmusty8432 + command: server /data --console-address ":9001" volumes: - - minio-data:/data + - ./minio-data:/data -volumes: - minio-data: - postgres_data: - driver: local +# Remove named volumes to use bind mounts +# volumes: +# minio-data: +# postgres_data: +# driver: local networks: backend: diff --git a/populate-qldb-store.sh b/populate-qldb-store.sh new file mode 100644 index 0000000..ccbd63e --- /dev/null +++ b/populate-qldb-store.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +# Configuration +MINIO_ALIAS="qldbminio" +MINIO_URL="http://localhost:9000" +MINIO_ROOT_USER="user" +MINIO_ROOT_PASSWORD="mmusty8432" +BUCKET_NAME="qldb" + +# Check for MinIO client +if ! command -v mc &> /dev/null +then + echo "MinIO client (mc) not found. " +fi + +# Configure MinIO client +mc alias set $MINIO_ALIAS $MINIO_URL $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD + +# Create ql db bucket +mc mb $MINIO_ALIAS/$BUCKET_NAME + +# Upload the two sample DBs +mc cp cmd/server/codeql/dbs/google/flatbuffers/google_flatbuffers_db.zip \ + cmd/server/codeql/dbs/psycopg/psycopg2/psycopg_psycopg2_db.zip \ + $MINIO_ALIAS/$BUCKET_NAME + +# Check new diskuse +du -k minio-data