Skip to content

Commit

Permalink
Merge pull request #27 from Cray-HPE/release/1.5.5
Browse files Browse the repository at this point in the history
Release/1.5.5
  • Loading branch information
rkleinman-hpe committed Mar 3, 2022
2 parents 9be8344 + 5a61847 commit f9bbf49
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.5.5] - 2022-03-03

### Changed

- Update Dockerfile to use alpine:3.15 for CVE remediation.

## [1.5.4] - 2022-03-01

Expand Down
25 changes: 24 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
#
# MIT License
#
# (C) Copyright 2021-2022 Hewlett Packard Enterprise Development LP
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
#
# Dockerfile for importing content into gitea instances on Shasta
# Copyright 2020-2021 Hewlett Packard Enterprise Development LP
#
Expand All @@ -20,7 +43,7 @@
# OTHER DEALINGS IN THE SOFTWARE.
#
# (MIT License)
FROM artifactory.algol60.net/docker.io/alpine:3.13 as base
FROM artifactory.algol60.net/docker.io/alpine:3.15 as base
WORKDIR /

# Supported Environment Variables (see README in this repository)
Expand Down

0 comments on commit f9bbf49

Please sign in to comment.