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

Updating AWS_IAM_AUTHENTICATOR & GOOGLE_CLOUD_SDK - CVE fix #74

Merged
merged 1 commit into from
Jan 4, 2024
Merged

Updating AWS_IAM_AUTHENTICATOR & GOOGLE_CLOUD_SDK - CVE fix #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions docker/ubi8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ LABEL summary='Red Hat certified Open Enterprise Spinnaker ubi8 container image
LABEL description='Certified Open Enterprise Spinnaker is an Enterprise grade, Red Hat certified and OpsMx supported release of the popular and critically acclaimed Continuous Delivery platform Spinnaker'
LABEL vendor='OpsMx'

RUN yum install -y python38
RUN yum install -y python38
ARG TARGETARCH


ENV KUBECTL_RELEASE=1.22.0
ENV AWS_CLI_VERSION=1.18.152
ENV AWS_CLI_S3_CMD=2.0.2
ENV AWS_AIM_AUTHENTICATOR_VERSION=0.5.9
ENV GOOGLE_CLOUD_SDK_VERSION=435.0.0
ENV AWS_AIM_AUTHENTICATOR_VERSION=0.6.14
ENV GOOGLE_CLOUD_SDK_VERSION=458.0.1
ENV ECR_TOKEN_VERSION=v1.0.2

ENV PATH "$PATH:/usr/local/bin/:/opt/google-cloud-sdk/bin/:/usr/local/bin/aws-iam-authenticator"

USER root
RUN yum -y install bash jq tar unzip wget unzip procps java-17-openjdk-devel.x86_64 vim net-tools curl git
RUN yum -y install bash jq tar unzip wget unzip procps java-17-openjdk-devel.x86_64 vim net-tools curl git

# AWS CLI
RUN yum -y install python3-pip && \
Expand Down
14 changes: 7 additions & 7 deletions docker/ubi8/Dockerfile-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,22 @@ RUN fips-mode-setup --enable
# Setting crypto policies to FIPS
RUN update-crypto-policies --set FIPS

RUN yum install -y python38
RUN yum install -y python38
ARG TARGETARCH


ENV KUBECTL_RELEASE=1.22.0
ENV AWS_CLI_S3_CMD=2.0.2
ENV AWS_AIM_AUTHENTICATOR_VERSION=0.5.9
ENV GOOGLE_CLOUD_SDK_VERSION=435.0.0
ENV AWS_AIM_AUTHENTICATOR_VERSION=0.6.14
ENV GOOGLE_CLOUD_SDK_VERSION=458.0.1
ENV ECR_TOKEN_VERSION=v1.0.2

ENV PATH "$PATH:/usr/local/bin/:/opt/google-cloud-sdk/bin/:/usr/local/bin/aws-iam-authenticator"

USER root


#RUN yum -y install bash jq tar unzip wget procps java-17-openjdk-devel.x86_64 vim net-tools curl git
#RUN yum -y install bash jq tar unzip wget procps java-17-openjdk-devel.x86_64 vim net-tools curl git

RUN yum -y install wget git

Expand Down Expand Up @@ -85,8 +85,8 @@ RUN wget https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_RE
RUN mkdir -p /opt/jaeger
COPY jaeger/opentelemetry-javaagent.jar /opt/jaeger/opentelemetry-javaagent.jar

#RUN yum -y remove tar curl
#RUN yum -y remove vim jq unzip
#RUN yum -y remove tar curl
#RUN yum -y remove vim jq unzip
RUN yum -y remove clean all && rm -rf /var/cache


Expand All @@ -107,7 +107,7 @@ ENV CUSTOMPLUGIN_RELEASEREPO=$CUSTOMPLUGIN_RELEASEREPO
ARG CUSTOMPLUGIN_RELEASEVERSION
ENV CUSTOMPLUGIN_RELEASEVERSION=$CUSTOMPLUGIN_RELEASEVERSION

RUN wget -O Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip -c https://github.com/${CUSTOMPLUGIN_RELEASEORG}/${CUSTOMPLUGIN_RELEASEREPO}/releases/download/${CUSTOMPLUGIN_RELEASEVERSION}/armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}.zip -P /opt/clouddriver/plugins
RUN wget -O Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip -c https://github.com/${CUSTOMPLUGIN_RELEASEORG}/${CUSTOMPLUGIN_RELEASEREPO}/releases/download/${CUSTOMPLUGIN_RELEASEVERSION}/armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}.zip -P /opt/clouddriver/plugins

RUN mv Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip /opt/clouddriver/plugins/

Expand Down
12 changes: 6 additions & 6 deletions docker/ubi8/Dockerfile-fips
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ ARG TARGETARCH

ENV KUBECTL_RELEASE=1.22.0
ENV AWS_CLI_S3_CMD=2.0.2
ENV AWS_AIM_AUTHENTICATOR_VERSION=0.5.9
ENV GOOGLE_CLOUD_SDK_VERSION=435.0.0
ENV AWS_AIM_AUTHENTICATOR_VERSION=0.6.14
ENV GOOGLE_CLOUD_SDK_VERSION=458.0.1
ENV ECR_TOKEN_VERSION=v1.0.2

ENV PATH "$PATH:/usr/local/bin/:/opt/google-cloud-sdk/bin/:/usr/local/bin/aws-iam-authenticator"

USER root
#RUN yum -y install bash jq tar unzip wget procps java-17-openjdk-devel.x86_64 vim net-tools curl git
#RUN yum -y install bash jq tar unzip wget procps java-17-openjdk-devel.x86_64 vim net-tools curl git

RUN yum -y install wget git

Expand Down Expand Up @@ -82,8 +82,8 @@ COPY clouddriver-web/build/install/clouddriver /opt/clouddriver



#RUN yum -y remove tar curl
#RUN yum -y remove vim jq unzip
#RUN yum -y remove tar curl
#RUN yum -y remove vim jq unzip
RUN yum -y remove clean all && rm -rf /var/cache

RUN adduser spinnaker
Expand All @@ -102,7 +102,7 @@ ENV CUSTOMPLUGIN_RELEASEVERSION=$CUSTOMPLUGIN_RELEASEVERSION



RUN wget -O Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip -c https://github.com/${CUSTOMPLUGIN_RELEASEORG}/${CUSTOMPLUGIN_RELEASEREPO}/releases/download/${CUSTOMPLUGIN_RELEASEVERSION}/armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}.zip -P /opt/clouddriver/plugins
RUN wget -O Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip -c https://github.com/${CUSTOMPLUGIN_RELEASEORG}/${CUSTOMPLUGIN_RELEASEREPO}/releases/download/${CUSTOMPLUGIN_RELEASEVERSION}/armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}.zip -P /opt/clouddriver/plugins
RUN mv Armory.armory-observability-plugin-${CUSTOMPLUGIN_RELEASEVERSION}-SNAPSHOT.zip /opt/clouddriver/plugins/

RUN chmod -R 777 /opt/clouddriver/plugins/
Expand Down
Loading