Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert esbuild changes #322

Merged
merged 4 commits into from
Dec 17, 2024
Merged

revert esbuild changes #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a837c81
revert 5cf15f51331d7224991e97793f3775d1ae154323
NourAlharithi Dec 17, 2024
e8d5f62
Revert "fix --frozen-lockfile issue in Docker build (again)"
NourAlharithi Dec 17, 2024
f831d39
Revert "fix --forzen-lockfile issue in Docker build"
NourAlharithi Dec 17, 2024
3c701b6
Revert "shrink docker image / esbuildify (#319)"
NourAlharithi Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .dockerignore
View file
Open in desktop

This file was deleted.

41 changes: 12 additions & 29 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,19 @@
FROM node:20.18.1 AS builder
FROM public.ecr.aws/bitnami/node:20.18.1
RUN apt-get install git
ENV NODE_ENV=production
RUN npm install -g typescript

WORKDIR /app

# Copy package files first to leverage cache
COPY package.json yarn.lock ./
COPY drift-common/protocol/sdk/package.json ./drift-common/protocol/sdk/
COPY drift-common/common-ts/package.json ./drift-common/common-ts/

RUN npm install -g bun typescript husky

COPY drift-common /app/drift-common
COPY . .
WORKDIR /app/drift-common/protocol/sdk
COPY drift-common/protocol/sdk/ .
RUN bun install && bun run build

RUN yarn
RUN yarn build
WORKDIR /app/drift-common/common-ts
COPY drift-common/common-ts/ .
RUN bun install && bun run build

RUN yarn
RUN yarn build
WORKDIR /app
COPY . .
# no '--production' for esbuild
RUN bun install && bun esbuild.config.js

FROM node:20.18.1-alpine
# 'bigint-buffer' native lib for performance
# @triton-one/yellowstone-grpc so .wasm lib included
RUN apk add python3 make g++ --virtual .build &&\
npm install -C /lib bigint-buffer @triton-one/yellowstone-grpc &&\
apk del .build
COPY --from=builder /app/lib/ ./lib/
RUN yarn
RUN yarn build

ENV NODE_ENV=production
EXPOSE 9464

CMD ["node", "./lib/index.js"]
28 changes: 0 additions & 28 deletions esbuild.config.js
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"license": "Apache-2.0",
"dependencies": {
"@coral-xyz/anchor": "^0.29.0",
"@drift-labs/sdk": "file:./drift-common/protocol/sdk",
"@drift/common": "file:./drift-common/common-ts",
"@drift-labs/sdk": "file:./drift-common/protocol/sdk",
"@opentelemetry/api": "^1.1.0",
"@opentelemetry/auto-instrumentations-node": "^0.31.1",
"@opentelemetry/exporter-prometheus": "^0.31.0",
Expand All @@ -33,6 +33,7 @@
"response-time": "^2.3.2",
"rxjs": "^7.8.1",
"socket.io-redis": "^6.1.1",
"typescript": "4.5.4",
"undici": "^6.16.1",
"winston": "^3.8.1",
"ws": "^8.14.2"
Expand All @@ -41,14 +42,12 @@
"@types/k6": "^0.45.0",
"@typescript-eslint/eslint-plugin": "^4.28.0",
"@typescript-eslint/parser": "^4.28.0",
"esbuild": "^0.24.0",
"eslint": "^7.29.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"husky": "^7.0.4",
"k6": "^0.0.0",
"prettier": "^2.4.1",
"tiny-glob": "^0.2.9",
"ts-node": "^10.9.1"
},
"scripts": {
Expand Down