Skip to content

Commit

Permalink
Node20.x and deps bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Rocco Zanni committed Nov 27, 2023
1 parent 7dd9867 commit b2a208f
Show file tree
Hide file tree
Showing 9 changed files with 5,445 additions and 2,645 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: '18.x'
node-version: '20.x'
- run: npm ci
working-directory: ./monitor
- run: npm ci
Expand Down
11 changes: 7 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM amazonlinux:2023.2.20230920.1
FROM public.ecr.aws/lambda/nodejs:20
ARG BUILDPLATFORM TARGETPLATFORM TARGETOS TARGETARCH

# Install nodejs
RUN yum install nodejs npm git wget unzip -y && yum clean all
RUN dnf install wget unzip -y && dnf clean all

# Install awscli
RUN if [ "$TARGETARCH" = "arm64" ]; then \
Expand All @@ -26,7 +26,7 @@ RUN mkdir -p /workspace/poduptime \
WORKDIR /workspace/poduptime

# Install the serverless framework
RUN npm install -g serverless@^3.35.2
RUN npm install -g serverless@^3.38.0

# Install deps
COPY analytics/package*.json analytics
Expand All @@ -41,4 +41,7 @@ COPY analytics analytics
COPY monitor monitor
COPY website website
COPY conf_test.js .*
COPY package*.json ./
COPY package*.json ./

# Reset endpoint defined in base image
ENTRYPOINT []
5,304 changes: 3,202 additions & 2,102 deletions analytics/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@aws-sdk/client-s3": "^3.421.0",
"@aws-sdk/client-sqs": "^3.427.0",
"@aws-sdk/rds-signer": "^3.430.0",
"@aws-sdk/client-s3": "^3.458.0",
"@aws-sdk/client-sqs": "^3.458.0",
"@aws-sdk/rds-signer": "^3.458.0",
"aws-sdk-client-mock": "^3.0.0",
"serverless-prune-plugin": "^2.0.2"
},
Expand All @@ -21,4 +21,4 @@
"lodash-es": "^4.17.21",
"pg": "^8.11.3"
}
}
}
2 changes: 1 addition & 1 deletion analytics/serverless.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
frameworkVersion: "^3.35.2"
frameworkVersion: "^3.38.0"

service: ${self:custom.appPrefix}

Expand Down
Loading

0 comments on commit b2a208f

Please sign in to comment.