Skip to content

Commit

Permalink
chore: security updates
Browse files Browse the repository at this point in the history
  • Loading branch information
awlayton committed Nov 20, 2024
1 parent 93b5d1b commit c2c72a6
Show file tree
Hide file tree
Showing 6 changed files with 245 additions and 406 deletions.
2 changes: 0 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.5.1.cjs
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ ENV PUPPETEER_SKIP_DOWNLOAD=true

WORKDIR ${DIR}

RUN yarn set version berry
RUN corepack yarn set version berry

COPY ./package.json ./yarn.lock ./.yarnrc.yml ${DIR}/
COPY ./template/package.json ${DIR}/template/
COPY ./service/package.json ${DIR}/service/

RUN chown -R node:node ${DIR} \
&& yarn workspaces focus --all --production
&& corepack yarn workspaces focus --all --production

ENTRYPOINT ["/usr/bin/dumb-init", "--rewrite", "15:2", "--", "yarn", "workspace", "@qlever-llc/zendesk-sync", "run"]
ENTRYPOINT ["/usr/bin/dumb-init", "--rewrite", "15:2", "--", "corepack", "yarn", "workspace", "@qlever-llc/zendesk-sync", "run"]
CMD ["start"]

###
Expand All @@ -56,10 +56,10 @@ ARG DIR

WORKDIR ${DIR}/template/

RUN yarn install --immutable
RUN corepack yarn install --immutable

COPY ./template ${DIR}/template
RUN yarn build
RUN corepack yarn build

###
## Install and build node service
Expand All @@ -70,12 +70,12 @@ ARG DIR
WORKDIR ${DIR}/service/

# Install dev deps too
RUN yarn install --immutable
RUN corepack yarn install --immutable

COPY ./service ${DIR}/service

# build code
RUN yarn build --verbose
RUN corepack yarn build --verbose

###
## Final
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
},
"resolutions": {
"cookie": "^1.0.0",
"cross-spawn": "^7.0.5",
"jsonpath-plus": "^10.0.0",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
}
Expand Down
16 changes: 8 additions & 8 deletions service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,22 @@
},
"license": "Apache-2.0",
"dependencies": {
"@oada/client": "^5.2.3",
"@oada/client": "^5.2.4",
"@oada/jobs": "^4.7.1",
"@oada/lib-config": "^4.0.0",
"@oada/lib-prom": "^4.0.0",
"@oada/lib-prom": "^4.0.1",
"@oada/pino-debug": "^4.0.1",
"@oada/types": "^3.5.3",
"axios": "^1.7.7",
"axios-cache-interceptor": "^1.6.2",
"cron": "^3.1.9",
"cron": "^3.2.1",
"debug": "^4.3.7",
"es-main": "^1.3.0",
"md5": "^2.3.0",
"p-queue": "^8.0.1",
"p-throttle": "^6.2.0",
"p-timeout": "^6.1.3",
"puppeteer": "^23.7.0",
"puppeteer": "^23.8.0",
"tslib": "^2.8.1"
},
"devDependencies": {
Expand All @@ -78,7 +78,7 @@
"@types/cron": "^2.4.3",
"@types/debug": "^4.1.12",
"@types/md5": "^2.3.5",
"@types/node": "^22.9.0",
"@types/node": "^22.9.1",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@yarnpkg/sdks": "^3.2.0",
Expand All @@ -104,12 +104,12 @@
"eslint-plugin-optimize-regex": "^1.2.1",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^7.1.0",
"eslint-plugin-regexp": "^2.6.0",
"eslint-plugin-regexp": "^2.7.0",
"eslint-plugin-security": "^3.0.1",
"eslint-plugin-sonarjs": "^2.0.4",
"eslint-plugin-unicorn": "^56.0.0",
"eslint-plugin-unicorn": "^56.0.1",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.14",
"tailwindcss": "^3.4.15",
"typescript": "^5.6.3"
},
"resolutions": {
Expand Down
22 changes: 11 additions & 11 deletions template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
"devDependencies": {
"@sveltejs/adapter-auto": "^3.3.1",
"@sveltejs/adapter-static": "^3.0.6",
"@sveltejs/kit": "^2.7.7",
"@sveltejs/vite-plugin-svelte": "^4.0.0",
"@sveltejs/kit": "^2.8.1",
"@sveltejs/vite-plugin-svelte": "^4.0.1",
"@tailwindcss/typography": "^0.5.15",
"@tsconfig/node22": "^22.0.0",
"@typescript-eslint/eslint-plugin": "^8.13.0",
"@typescript-eslint/parser": "^8.13.0",
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
"autoprefixer": "^10.4.20",
"daisyui": "^4.12.14",
"date-fns": "^4.1.0",
Expand All @@ -50,18 +50,18 @@
"eslint-plugin-optimize-regex": "^1.2.1",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^7.1.0",
"eslint-plugin-regexp": "^2.6.0",
"eslint-plugin-regexp": "^2.7.0",
"eslint-plugin-security": "^3.0.1",
"eslint-plugin-sonarjs": "^2.0.4",
"eslint-plugin-unicorn": "^56.0.0",
"postcss": "^8.4.47",
"eslint-plugin-unicorn": "^56.0.1",
"postcss": "^8.4.49",
"prettier": "^3.3.3",
"pretty-bytes": "^6.1.1",
"svelte": "^5.1.11",
"svelte-check": "^4.0.5",
"tailwindcss": "^3.4.14",
"svelte": "^5.2.6",
"svelte-check": "^4.0.9",
"tailwindcss": "^3.4.15",
"typescript": "^5.6.3",
"vite": "^5.4.10"
"vite": "^5.4.11"
},
"volta": {
"node": "22.6.0"
Expand Down
Loading

0 comments on commit c2c72a6

Please sign in to comment.