Skip to content

Commit

Permalink
Merge pull request #49 from burmanm/update_base_images
Browse files Browse the repository at this point in the history
Update base images for better security rating
  • Loading branch information
burmanm authored Jun 26, 2023
2 parents 399756b + 30660df commit 537bbf2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Copyright DataStax, Inc.
# Please see the included license file for details.
FROM --platform=${BUILDPLATFORM} maven:3.6.3-adoptopenjdk-8 as builder
FROM --platform=${BUILDPLATFORM} maven:3.9.2-eclipse-temurin-8 as builder

COPY . .

RUN ./gradlew copyDockerBuildCtx

# The datastax base image is not multiarch presently, so we use the openjdk
# image as our base for arm builds instead.
FROM --platform=linux/arm64 openjdk:8u171-jdk-slim-stretch as base-arm64
FROM --platform=linux/arm64 eclipse-temurin:8u372-b07-jdk as base-arm64

FROM --platform=linux/amd64 datastax/ds-base-debian-openjdk-8:8u252-jdk-slim-buster-20200602 as base-amd64
FROM --platform=linux/amd64 datastax/ds-base-debian-openjdk-8:latest as base-amd64

FROM base-${TARGETARCH} as cass-config-builder

Expand All @@ -34,7 +34,7 @@ ENTRYPOINT ["/usr/local/bin/entrypoint"]

USER ${USER_UID}

FROM registry.access.redhat.com/ubi7/ubi-minimal:7.8 AS builder-ubi
FROM registry.access.redhat.com/ubi7/ubi-minimal:7.9 AS builder-ubi

# Update the builder packages and create user
RUN microdnf update && rm -rf /var/cache/yum && \
Expand All @@ -43,7 +43,7 @@ RUN microdnf update && rm -rf /var/cache/yum && \

#############################################################

FROM registry.access.redhat.com/ubi7/ubi-minimal:7.8 as cass-config-builder-ubi
FROM registry.access.redhat.com/ubi7/ubi-minimal:7.9 as cass-config-builder-ubi

LABEL maintainer="DataStax, Inc <[email protected]>"
LABEL name="cass-config-builder"
Expand Down
2 changes: 1 addition & 1 deletion scripts/push-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ UBI_ARGS=(
docker buildx build --push \
"${DOCKERHUB_UBI_TAGS[@]}" \
"${UBI_ARGS[@]}" \
--platform linux/amd64,linux/arm64 .
--platform linux/amd64 .

docker buildx build --push \
"${DOCKERHUB_TAGS[@]}" \
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.6
1.0.7

0 comments on commit 537bbf2

Please sign in to comment.