diff --git a/.gitignore b/.gitignore index 2eea525..e41279b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -.env \ No newline at end of file +.env +api/privkey.pem +api/cert.pem \ No newline at end of file diff --git a/api/Dockerfile b/api/Dockerfile index a132f9b..181f3d0 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -12,4 +12,4 @@ RUN poetry install --no-dev COPY ./api /code/api -CMD ["uvicorn", "api.main:app", "--host", "0.0.0.0", "--port", "80"] +CMD ["uvicorn", "api.main:app", "--host", "0.0.0.0", "--port", "80", "--ssl-keyfile", "/code/api/privkey.pem", "--ssl-certfile", "/code/api/cert.pem"] diff --git a/api/pyproject.toml b/api/pyproject.toml index 90f4f0e..a2f88b5 100644 --- a/api/pyproject.toml +++ b/api/pyproject.toml @@ -11,7 +11,7 @@ fastapi = "^0.78.0" httpx = "^0.23.0" pendulum = "^2.1.2" SQLAlchemy = "^1.4.37" -psycopg2 = "^2.9.3" +psycopg2-binary = "^2.9.3" asyncpg = "^0.25.0" databases = "^0.6.0" fastapi-cache2 = "^0.1.8" diff --git a/pipeline/Dockerfile b/pipeline/Dockerfile index 0d1c8b7..c06589f 100644 --- a/pipeline/Dockerfile +++ b/pipeline/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get update -y && apt-get install -y openssh-client git cron curl RUN curl -sL https://deb.nodesource.com/setup_16.x | bash RUN apt-get -y install nodejs +RUN apt-get -y install libpq-dev libpq5 # download public key for github.com RUN mkdir -p -m 0600 ~/.ssh && ssh-keyscan github.com >> ~/.ssh/known_hosts @@ -27,8 +28,9 @@ COPY ./meltano.yml . RUN --mount=type=ssh meltano install RUN npm i -g graphql-api-to-json-schema npm-cli-login -RUN NPM_USER=${NPM_USER} NPM_PASS=${NPM_PASS} NPM_EMAIL=${NPM_EMAIL} NPM_SCOPE=${NPM_SCOPE} NPM_REGISTRY=https://npm.pkg.github.com npm-cli-login -RUN npm i -g @superkeyio/block-gobbler +# RUN NPM_USER=${NPM_USER} NPM_PASS=${NPM_PASS} NPM_EMAIL=${NPM_EMAIL} NPM_SCOPE=${NPM_SCOPE} NPM_REGISTRY=https://npm.pkg.github.com npm-cli-login +# RUN npm i -g @superkeyio/block-gobbler +RUN npm i -g https://github.com/superkeyio/block-gobbler # Pin `discovery.yml` manifest by copying cached version to project root RUN cp -n .meltano/cache/discovery.yml . 2>/dev/null || : diff --git a/pipeline/meltano.yml b/pipeline/meltano.yml index 34e6702..4b5817d 100644 --- a/pipeline/meltano.yml +++ b/pipeline/meltano.yml @@ -31,8 +31,10 @@ plugins: quote: USDT timeframe: 1m start_date: '2022-02-08T00:00:00Z' + -id: bkex + pairs: - base: OSQTH - quote: USD + quote: USDT timeframe: 1m start_date: '2022-09-08T00:00:00Z' - id: gateio diff --git a/pipeline/requirements.txt b/pipeline/requirements.txt index e69de29..810ba6c 100644 --- a/pipeline/requirements.txt +++ b/pipeline/requirements.txt @@ -0,0 +1 @@ +psycopg2-binary \ No newline at end of file