From 4b70d08e15a63f5a6962cbb39a39e912d6b69469 Mon Sep 17 00:00:00 2001 From: Akshaya Acharya Date: Fri, 25 Oct 2024 01:25:05 +0530 Subject: [PATCH] Add duckdb dependency to dockerfile --- Dockerfile | 17 ++++++++++++----- docker/package-restore.sh | 2 +- docker/start.sh | 4 ++-- ndc-duckduckapi/package-lock.json | 4 ++-- ndc-duckduckapi/package.json | 5 ++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index c31a582..845e37f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,20 @@ -FROM node:20-alpine +FROM node:20 -RUN apk add jq curl +SHELL ["/bin/bash", "-c"] -COPY /docker /scripts +# Install required system dependencies using apt-get for Debian +RUN apt-get update && apt-get install -y jq curl +# Copy scripts and set up functions directory +COPY /docker /scripts RUN mkdir -p /functions && /scripts/package-restore.sh +# Expose port EXPOSE 8080 -HEALTHCHECK --interval=5s --timeout=10s --start-period=1s --retries=3 CMD [ "sh", "-c", "exec curl -f http://localhost:${HASURA_CONNECTOR_PORT:-8080}/health" ] +# Health check +HEALTHCHECK --interval=5s --timeout=10s --start-period=1s --retries=3 \ + CMD [ "sh", "-c", "exec curl -f http://localhost:${HASURA_CONNECTOR_PORT:-8080}/health" ] -CMD [ "sh", "/scripts/start.sh" ] +# Start command +CMD [ "bash", "/scripts/start.sh" ] diff --git a/docker/package-restore.sh b/docker/package-restore.sh index a6cd6e6..a5ddcf2 100755 --- a/docker/package-restore.sh +++ b/docker/package-restore.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -eu -o pipefail cd /functions diff --git a/docker/start.sh b/docker/start.sh index 221802a..0951dbb 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -eu -o pipefail /scripts/package-restore.sh @@ -10,4 +10,4 @@ cd /functions # are propagated properly. "npm start" does not propagate SIGTERM to the # actual started process START_CMD=$(jq -r ".scripts.start" "package.json") -PATH=$PATH:/functions/node_modules/.bin exec $START_CMD +NODE_OPTIONS="--max-old-space-size=4096" PATH=$PATH:/functions/node_modules/.bin exec $START_CMD diff --git a/ndc-duckduckapi/package-lock.json b/ndc-duckduckapi/package-lock.json index 209fd47..9cd3524 100644 --- a/ndc-duckduckapi/package-lock.json +++ b/ndc-duckduckapi/package-lock.json @@ -1,12 +1,12 @@ { "name": "@hasura/ndc-duckduckapi", - "version": "0.1.3", + "version": "0.1.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@hasura/ndc-duckduckapi", - "version": "0.1.3", + "version": "0.1.4", "license": "Apache-2.0", "dependencies": { "@hasura/ndc-lambda-sdk": "^1.9.0", diff --git a/ndc-duckduckapi/package.json b/ndc-duckduckapi/package.json index 828cd21..ee9b011 100644 --- a/ndc-duckduckapi/package.json +++ b/ndc-duckduckapi/package.json @@ -1,6 +1,6 @@ { "name": "@hasura/ndc-duckduckapi", - "version": "0.1.4", + "version": "0.1.5", "description": "SDK for the Hasura DDN DuckDuckAPI connector. Easily build a data API from any existing API by ETLing data into DuckDB.", "author": "Hasura", "license": "Apache-2.0", @@ -32,6 +32,5 @@ "sql-formatter": "^13.0.4", "sqlstring-sqlite": "^0.1.1" }, - "devDependencies": { - } + "devDependencies": {} }