Skip to content

Commit be0a6a2

Browse files
authored
Merge branch 'main-enterprise' into bug/issue-465
2 parents 1c081a1 + 4578aea commit be0a6a2

8 files changed

Lines changed: 61 additions & 60 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
1414
# [Optional] Uncomment if you want to install more global node modules
1515
# RUN su node -c "npm install -g <your-package-list-here>"
1616

17-
# Update npm
18-
RUN npm install -g npm
19-
# Intall aws cli
17+
# Install aws cli
2018
RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-$(uname -m).zip" -o "awscliv2.zip" && \
2119
unzip awscliv2.zip && \
2220
sudo ./aws/install && \

.github/workflows/create-pre-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
with:
4949
node-version: 22.x
5050
cache: 'npm'
51-
- run: npm install
51+
- run: npm ci
5252
- name: Set up Docker Buildx
5353
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f
5454
- name: Log in to the Container registry
@@ -58,7 +58,7 @@ jobs:
5858
username: ${{ github.actor }}
5959
password: ${{ secrets.GITHUB_TOKEN }}
6060
- name: Build Docker Image Locally
61-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
61+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
6262
with:
6363
context: .
6464
file: ./Dockerfile
@@ -86,7 +86,7 @@ jobs:
8686
commitish: ${{ github.ref }}
8787
- name: Push Docker Image
8888
if: ${{ success() }}
89-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
89+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
9090
with:
9191
context: .
9292
file: ./Dockerfile

.github/workflows/create-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
node-version: 22.x
2828
cache: "npm"
29-
- run: npm install
29+
- run: npm ci
3030
- name: Set up Docker Buildx
3131
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f
3232
- name: Log in to the Container registry
@@ -36,7 +36,7 @@ jobs:
3636
username: ${{ github.actor }}
3737
password: ${{ secrets.GITHUB_TOKEN }}
3838
- name: Build Docker Image Locally
39-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
39+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
4040
with:
4141
context: .
4242
file: ./Dockerfile
@@ -59,7 +59,7 @@ jobs:
5959
bump: final
6060
- name: Push Docker Image
6161
if: ${{ success() }}
62-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
62+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
6363
with:
6464
context: .
6565
file: ./Dockerfile

.github/workflows/node-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
node-version: ${{ matrix.node-version }}
2222
cache: npm
23-
- run: npm install
23+
- run: npm ci
2424
- run: npm run test:unit:ci
2525
strategy:
2626
matrix:

.github/workflows/rc-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- name: Set up Docker Buildx
7777
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f
7878
- name: Build and push Docker image
79-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
79+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294
8080
with:
8181
context: .
8282
push: true

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:22-alpine
1+
FROM node:22-alpine@sha256:4d64b49e6c891c8fc821007cb1cdc6c0db7773110ac2c34bf2e6960adef62ed3
22
WORKDIR /opt/safe-settings
33
ENV NODE_ENV production
44
ENV HOST=0.0.0.0

package-lock.json

Lines changed: 50 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"node-cron": "^4.2.1",
3636
"octokit": "^5.0.2",
3737
"probot": "^14.2.4",
38-
"proxy-from-env": "^1.1.0",
38+
"proxy-from-env": "^2.1.0",
3939
"undici": "^7.7.0"
4040
},
4141
"devDependencies": {

0 commit comments

Comments
 (0)