Skip to content

Commit

Permalink
Merge pull request #24 from lokalise/feature/MRP_712_update_node_version
Browse files Browse the repository at this point in the history
MRP-712 Update node version
  • Loading branch information
m-evans-1 authored Aug 22, 2023
2 parents 32baa39 + 8866a53 commit a8c4a90
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ---- Base Node ----
FROM node:18.7.1-bookworm-slim as base
FROM node:18.17.1-bookworm-slim as base

RUN set -ex;\
apt-get update -y; \
Expand Down
32 changes: 28 additions & 4 deletions Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
FROM node:18.15.0-alpine3.17
FROM node:18.17.1-bookworm-slim

RUN apk update && apk add git openssh
RUN set -ex;\
apt-get update -y; \
apt-get install -y --no-install-recommends libssl3; \
rm -rf /var/lib/apt/lists/*;

WORKDIR /app
COPY package*.json ./
RUN mkdir -p /home/node/app
RUN chown -R node:node /home/node && chmod -R 770 /home/node
WORKDIR /home/node/app

RUN set -ex; \
apt-get update -y ; \
apt-get install -y --no-install-recommends \
ca-certificates \
dumb-init \
make \
gcc \
g++ \
python3 \
git \
openssl
COPY --chown=node:node ./package.json ./package.json
COPY --chown=node:node ./package-lock.json ./package-lock.json

USER node
RUN set -ex; \
npm ci --ignore-scripts ;

COPY . .

RUN npm ci
CMD npm run start:dev
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.PHONY: sync-modules
sync-modules:
docker compose cp app:/app/node_modules .
docker compose cp app:/home/node/app/node_modules .
3 changes: 2 additions & 1 deletion src/infrastructure/diConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ export function registerDependencies(
}
}

type DiConfig = Record<keyof Dependencies, Resolver<unknown>>
// eslint-disable-next-line @typescript-eslint/no-explicit-any
type DiConfig = Record<keyof Dependencies, Resolver<any>>

export interface Dependencies {
config: Config
Expand Down

0 comments on commit a8c4a90

Please sign in to comment.