diff --git a/Dockerfile b/Dockerfile index f0d6a98..e96348d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,8 +42,9 @@ ARG UID ARG GID COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /usr/local/src/imps/LICENSE /licenses/LICENSE +# RedHat certification requires application license to be in /licenses dir +COPY --from=builder /usr/local/src/imps/LICENSE /licenses/LICENSE COPY --from=builder /usr/local/bin/manager /manager COPY --from=builder /etc/passwd /etc/passwd @@ -58,8 +59,9 @@ ARG UID ARG GID COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /usr/local/src/imps/LICENSE /licenses/LICENSE +# RedHat certification requires application license to be in /licenses dir +COPY --from=builder /usr/local/src/imps/LICENSE /licenses/LICENSE COPY --from=builder /usr/local/bin/manager /manager COPY --from=builder /etc/passwd /etc/passwd diff --git a/Dockerfile-refresher b/Dockerfile-refresher index cb3e3ed..81263d3 100644 --- a/Dockerfile-refresher +++ b/Dockerfile-refresher @@ -42,8 +42,9 @@ ARG UID ARG GID COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /usr/local/src/imps/LICENSE /licenses/LICENSE +# RedHat certification requires application license to be in /licenses dir +COPY --from=builder /usr/local/src/imps/LICENSE /licenses/LICENSE COPY --from=builder /usr/local/bin/manager /manager COPY --from=builder /etc/passwd /etc/passwd @@ -58,8 +59,9 @@ ARG UID ARG GID COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ -COPY --from=builder /usr/local/src/imps/LICENSE /licenses/LICENSE +# RedHat certification requires application license to be in /licenses dir +COPY --from=builder /usr/local/src/imps/LICENSE /licenses/LICENSE COPY --from=builder /usr/local/bin/manager /manager COPY --from=builder /etc/passwd /etc/passwd diff --git a/Makefile b/Makefile index bb6f9dd..b8e5637 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ MAIN_PACKAGE ?= ./cmd/controller/ COMMIT_HASH ?= $(shell git rev-parse --short HEAD 2>/dev/null) BUILD_DATE ?= $(shell date +%FT%T%z) -VERSION ?= 0.3.11 +VERSION ?= 0.3.12 LDFLAGS += -X github.com/banzaicloud/imps/internal/version.commitHash=${COMMIT_HASH} LDFLAGS += -X github.com/banzaicloud/imps/internal/version.buildDate=${BUILD_DATE} LDFLAGS += -X github.com/banzaicloud/imps/internal/version.version=${VERSION} diff --git a/deploy/charts/imagepullsecrets/Chart.yaml b/deploy/charts/imagepullsecrets/Chart.yaml index 8b90961..75c1c8d 100644 --- a/deploy/charts/imagepullsecrets/Chart.yaml +++ b/deploy/charts/imagepullsecrets/Chart.yaml @@ -9,5 +9,5 @@ maintainers: sources: - https://github.com/banzaicloud/backyards -version: 0.3.11 -appVersion: 0.3.11 +version: 0.3.12 +appVersion: 0.3.12 diff --git a/deploy/charts/imagepullsecrets/values.yaml b/deploy/charts/imagepullsecrets/values.yaml index 8de4781..f0e013a 100644 --- a/deploy/charts/imagepullsecrets/values.yaml +++ b/deploy/charts/imagepullsecrets/values.yaml @@ -20,7 +20,7 @@ securityContext: - ALL image: repository: ghcr.io/banzaicloud/imagepullsecrets - tag: v0.3.11 + tag: v0.3.12 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/go.mod b/go.mod index 59106b5..d1c4731 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.10.0 github.com/aws/aws-sdk-go-v2/service/ecr v1.1.1 github.com/aws/aws-sdk-go-v2/service/sts v1.18.9 - github.com/banzaicloud/imps/api v0.3.11 + github.com/banzaicloud/imps/api v0.0.1 github.com/cisco-open/operator-tools v0.29.0 github.com/sirupsen/logrus v1.8.1 github.com/spf13/pflag v1.0.5