Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .github/workflows/test_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Trivy Setup
uses: aquasecurity/setup-trivy@v0.2.0
uses: aquasecurity/setup-trivy@e07451d2e059ed86c2870430ea286b3a9e0bf241
with:
cache: true
version: v0.64.1
version: v0.74.0

- name: Copy environment file for docker-compose
run: |
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# 共通ベース(脆弱性対応済み)
FROM node:22.13-slim AS base
FROM node:22.23.2-slim AS base

RUN apt-get update && apt-get upgrade -y && \
apt-get install -y tzdata tini wget && \
Expand Down
1,874 changes: 1,126 additions & 748 deletions backend/package-lock.json

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,7 @@
"private": true,
"license": "AGPL",
"overrides": {
"form-data": "^4.0.4",
"sha.js": "^2.4.12",
"tar": "^7.5.3",
"validator": "^13.15.22",
"qs": "^6.14.1",
"glob": "^11.1.0",
"jws": "^3.2.3"
"multer": "^2.3.0"
},
"scripts": {
"build": "nest build",
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ services:
entrypoint: ["sh", "/home/postgrescli/scripts/add-column.sh"]

keycloak:
image: quay.io/keycloak/keycloak:26.5.1
image: quay.io/keycloak/keycloak:26.7.2
hostname: keycloak
container_name: keycloak
ports:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ services:
entrypoint: ["sh", "/home/postgrescli/scripts/add-column.sh"]

keycloak:
image: quay.io/keycloak/keycloak:26.5.1
image: quay.io/keycloak/keycloak:26.7.2

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docker-compose.yml では Keycloak のバージョンが 26.7.2 に更新されていますが、docker-compose-dev.yml 側も合わせて更新する必要はないでしょうか?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docker-compose-dev.yml 更新いたします
その他の修正箇所に関しては一旦別PRで対応とさせていただきます

hostname: keycloak
container_name: keycloak
ports:
Expand Down
2 changes: 1 addition & 1 deletion fiware/orion/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Base: fiware/orion:4.3.0 (Debian 12.13)
# Target: Debian 12.13 with security updates and vulnerable package fixes

FROM fiware/orion:4.3.0
FROM fiware/orion:4.5.0

USER root

Expand Down
5 changes: 3 additions & 2 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# 共通ベース(脆弱性対応済み)
FROM node:22.21.1-slim AS base
FROM node:22.23.2-slim AS base

RUN apt-get update && apt-get upgrade -y && \
apt-get install -y tzdata tini wget && \
apt-get autoremove -y && apt-get autoclean && \
Expand All @@ -10,7 +11,7 @@ FROM base AS dev
ENV NODE_ENV=development

# FROM node:20-slim AS build
FROM node:22.21.1 AS build
FROM node:22.23.2-slim AS build

WORKDIR /app/frontend

Expand Down
Loading
Loading