Skip to content

Commit 4cb7a59

Browse files
authored
Update image dependencies for security updates (#14)
* Updated image dependencies for security updates * Updated Dockerfiles to install python packages via virtual environment due to image update * Internal tracking ticket: CASMHMS-6411
1 parent 3699a20 commit 4cb7a59

File tree

4 files changed

+27
-15
lines changed

4 files changed

+27
-15
lines changed

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.0
1+
1.7.0

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ Removed - for now removed features
2323
Fixed - for any bug fixes
2424
Security - in case of vulnerabilities
2525
-->
26+
27+
## [1.7.0] - 2025-03-11
28+
29+
### Security
30+
31+
- Updated image dependencies for security updates
32+
- Updated Dockerfiles to install python packages via virtual environment due to image update
33+
2634
## [1.6.0] - 2024-08-23
2735

2836
### Added

Dockerfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BSD 3-Clause License
22
#
3-
# Copyright [2022,2024] Hewlett Packard Enterprise Development LP
3+
# Copyright [2022,2024-2025] Hewlett Packard Enterprise Development LP
44
#
55
# Redistribution and use in source and binary forms, with or without
66
# modification, are permitted provided that the following conditions are met:
@@ -28,7 +28,7 @@
2828
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
# POSSIBILITY OF SUCH DAMAGE.
3030

31-
FROM artifactory.algol60.net/docker.io/library/alpine:3.17 AS base
31+
FROM artifactory.algol60.net/docker.io/library/alpine:3.21 AS base
3232

3333
COPY src/requirements.txt /app/requirements.txt
3434

@@ -46,12 +46,15 @@ RUN set -ex \
4646
musl-dev \
4747
cargo \
4848
curl \
49+
&& python3 -m venv /opt/venv \
50+
&& . /opt/venv/bin/activate \
4951
&& pip3 install --upgrade \
5052
pip \
5153
&& pip3 install \
5254
setuptools \
5355
&& pip3 install wheel \
5456
&& pip3 install -r /app/requirements.txt \
57+
&& deactivate \
5558
&& apk del \
5659
build-base \
5760
gcc \
@@ -61,6 +64,9 @@ RUN set -ex \
6164
musl-dev \
6265
cargo
6366

67+
# Set the PATH to include the virtual environment
68+
ENV PATH="/opt/venv/bin:$PATH"
69+
6470
# Insert our emulator extentions
6571
COPY src /app
6672
COPY mockups /app/api_emulator/redfish/static

docker-compose.developer.full.yaml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
version: '3.7'
3-
42
networks:
53
hms:
64

@@ -10,7 +8,7 @@ services:
108
#
119
vault:
1210
hostname: vault
13-
image: arti.dev.cray.com/third-party-docker-stable-local/vault:1.5.5
11+
image: arti.dev.cray.com/third-party-docker-stable-local/vault:1.6.1
1412
environment:
1513
- VAULT_DEV_ROOT_TOKEN_ID=hms
1614
- VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200
@@ -22,7 +20,7 @@ services:
2220
networks:
2321
- hms
2422
vault-kv-enabler:
25-
image: artifactory.algol60.net/csm-docker/stable/vault-kv-enabler:1.13.4
23+
image: artifactory.algol60.net/csm-docker/stable/vault-kv-enabler:1.25.0
2624
environment:
2725
- VAULT_ADDR=http://vault:8200
2826
- VAULT_TOKEN=hms
@@ -66,7 +64,7 @@ services:
6664
# hmcollector
6765
#
6866
cray-hms-hmcollector:
69-
image: artifactory.algol60.net/csm-docker/stable/hms-hmcollector:2.12.4
67+
image: artifactory.algol60.net/csm-docker/stable/hms-hmcollector:2.36.0
7068
command: sh -c "hmcollector -vault_keypath hms-creds -rest_url http://cray-hms-hmcollector"
7169
environment:
7270
- LOG_LEVEL=TRACE
@@ -103,7 +101,7 @@ services:
103101
networks:
104102
- hms
105103
cray-smd-init:
106-
image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.49.0
104+
image: artifactory.algol60.net/csm-docker/stable/cray-smd:2.35.0
107105
environment:
108106
- SMD_DBHOST=cray-smd-postgres
109107
- SMD_DBPORT=5432
@@ -113,7 +111,7 @@ services:
113111
- hms
114112
command: /entrypoint.sh smd-init
115113
cray-smd:
116-
image: artifactory.algol60.net/csm-docker/stable/cray-smd:1.49.0
114+
image: artifactory.algol60.net/csm-docker/stable/cray-smd:2.35.0
117115
environment:
118116
- POSTGRES_HOST=cray-smd-postgres
119117
- SMD_DBHOST=cray-smd-postgres
@@ -140,7 +138,7 @@ services:
140138
# CAPMC
141139
#
142140
cray-capmc:
143-
image: artifactory.algol60.net/csm-docker/stable/cray-capmc:2.1.0
141+
image: artifactory.algol60.net/csm-docker/stable/cray-capmc:3.6.0
144142
environment:
145143
- HSM_URL=http://cray-smd:27779
146144
- VAULT_ADDR=http://vault:8200
@@ -162,7 +160,7 @@ services:
162160
# FAS
163161
#
164162
# s3:
165-
# image: artifactory.algol60.net/docker.io/library/nginx:1.18.0
163+
# image: artifactory.algol60.net/docker.io/library/nginx:1.21.6
166164
# hostname: s3
167165
# # volumes:
168166
# # - ./Images:/usr/share/nginx/html
@@ -171,7 +169,7 @@ services:
171169
# networks:
172170
# - hms
173171
# etcd:
174-
# image: artifactory.algol60.net/quay.io/coreos/etcd:v3.4.7
172+
# image: artifactory.algol60.net/quay.io/coreos/etcd:v3.5.7
175173
# environment:
176174
# - ALLOW_NONE_AUTHENTICATION=yes
177175
# - ETCD_ADVERTISE_CLIENT_URLS=http://etcd:2379
@@ -182,7 +180,7 @@ services:
182180
# networks:
183181
# - hms
184182
# cray-fas:
185-
# image: artifactory.algol60.net/csm-docker/stable/cray-firmware-action:1.19.0
183+
# image: artifactory.algol60.net/csm-docker/stable/cray-firmware-action:1.40.0
186184
# environment:
187185
# - SMS_SERVER=http://cray-smd:27779
188186
# - CRAY_VAULT_AUTH_PATH=auth/token/create
@@ -211,7 +209,7 @@ services:
211209
# Emulator
212210
#
213211
emulator-loader:
214-
image: artifactory.algol60.net/docker.io/library/golang:1.16-alpine
212+
image: artifactory.algol60.net/docker.io/library/golang:1.23-alpine
215213
command: >
216214
sh -c "apk add curl && sleep 10 &&
217215
curl -X POST -d '{\"RedfishEndpoints\":[{

0 commit comments

Comments
 (0)