Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Spring framework #48

Merged
merged 3 commits into from
May 2, 2022
Merged

Upgrade Spring framework #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de4286a
Upgrade Spring framework
andytinkham May 2, 2022
17825fb
Update Dockerfile base images
andytinkham May 2, 2022
b8e0ab7
Add apt-get update & install gzip in final image
andytinkham May 2, 2022
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]
### Security
- Upgraded Spring to 2.6.7 & Maven/Ruby containers to latest versions
[conjurdemos/pet-store-demo#48](https://github.com/conjurdemos/pet-store-demo/pull/48)
- Upgraded Postgres to 42.3.2 to resolve CVE-2022-21724
[conjurdemos/pet-store-demo#45](https://github.com/conjurdemos/pet-store-demo/pull/45)

Expand Down
7 changes: 5 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# STAGE:
# Fetch summon

FROM ruby:2.5 as summon
FROM ruby:3.0 as summon

RUN apt-get update && \
apt-get install -y --no-install-recommends curl
Expand All @@ -17,7 +17,7 @@ RUN curl -sSL https://raw.githubusercontent.com/cyberark/summon/master/install.s

# STAGE:
# The 'maven' base is used to package the application
FROM maven:3.8.4-openjdk-11-slim as maven
FROM maven:3.8.5-openjdk-11-slim as maven

WORKDIR /app

Expand All @@ -38,6 +38,9 @@ RUN mvn package && cp target/petstore-*.jar app.jar
FROM openjdk:11-jdk-slim
LABEL org.opencontainers.image.authors="CyberArk"

# Install the fix for CVE-2022-1271
RUN apt-get update && apt-get dist-upgrade -y

COPY --from=summon /usr/local/lib/summon /usr/local/lib/summon
COPY --from=summon /usr/local/bin/summon /usr/local/bin/summon
COPY --from=maven /app/app.jar /app.jar
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.2</version>
<version>2.6.7</version>
</parent>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.6.2</version>
<version>2.6.7</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand All @@ -37,7 +37,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>2.6.2</version>
<version>2.6.7</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
Expand All @@ -47,7 +47,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<version>2.6.2</version>
<version>2.6.7</version>
</dependency>
</dependencies>

Expand Down