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.

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

Upgrade base images #541

Merged
merged 1 commit into from
Aug 9, 2023
Merged
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [1.6.1] - 2023-07-27

## [1.6.0] - 2023-07-19
### Security
- Updated go to 1.20, alpine to latest, and redhat UBI to ubi9 in main Dockerfile
[cyberark/secrets-provider-for-k8s#541](https://github.com/cyberark/secrets-provider-for-k8s/pull/541)

## [1.6.0] - 2023-07-19
### Added
- Log level is now configurable using the `LOG_LEVEL` environment variable or `conjur.org/log-level` annotation.
The existing `DEBUG` environment variable and `conjur.org/debug-logging` annotation is deprecated and will be removed in a future update.
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# =================== BASE BUILD LAYER ===================
# this layer is used to prepare a common layer for both debug and release builds
FROM golang:1.19 as secrets-provider-builder-base
FROM golang:1.20 as secrets-provider-builder-base
MAINTAINER CyberArk Software Ltd.

ENV GOOS=linux \
Expand Down Expand Up @@ -62,7 +62,7 @@ RUN go build -a -installsuffix cgo -gcflags="all=-N -l" -o secrets-provider ./cm

# =================== BASE MAIN CONTAINER ===================
# this layer is used to prepare a common layer for both debug and release containers
FROM alpine:3.14 as secrets-provider-base
FROM alpine:latest as secrets-provider-base
MAINTAINER CyberArk Software Ltd.

# Ensure openssl development libraries are always up to date
Expand Down Expand Up @@ -120,7 +120,7 @@ CMD ["/usr/local/bin/dlv", \
"/usr/local/bin/secrets-provider"]

# =================== MAIN CONTAINER (REDHAT) ===================
FROM registry.access.redhat.com/ubi8/ubi as secrets-provider-for-k8s-redhat
FROM registry.access.redhat.com/ubi9/ubi as secrets-provider-for-k8s-redhat
MAINTAINER CyberArk Software Ltd.

ARG VERSION
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.e2e
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-alpine
FROM golang:1.20-alpine
MAINTAINER CyberArk Software Ltd.
LABEL id="secrets-provider-for-k8s-e2e-test-runner"

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.junit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-alpine
FROM golang:1.20-alpine
MAINTAINER CyberArk Software Ltd.
LABEL id="secrets-provider-for-k8s-junit-processor"

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-alpine
FROM golang:1.20-alpine
MAINTAINER CyberArk Software Ltd.
LABEL id="secrets-provider-for-k8s-test-runner"

Expand Down