Skip to content

Commit 51a899b

Browse files
committed
Update templated files to rev ba5e22e (#53)
Automatically created PR based on commit ba5e22e990847d7e372a4af33c37cae3c306d19c in stackabletech/operator-templating repo. Triggered by: Manual run triggered by: razvan with message [Get Dockerfiles ready for OpenShift certification]
1 parent 6ffe634 commit 51a899b

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ SHELL=/bin/bash -euo pipefail
1616

1717
## Docker related targets
1818
docker-build:
19-
docker build --force-rm -t "docker.stackable.tech/stackable/spark-k8s-operator:${VERSION}" -f docker/Dockerfile .
19+
docker build --force-rm --build-arg VERSION=${VERSION} -t "docker.stackable.tech/stackable/spark-k8s-operator:${VERSION}" -f docker/Dockerfile .
2020

2121
docker-build-latest: docker-build
2222
docker tag "docker.stackable.tech/stackable/spark-k8s-operator:${VERSION}" \

docker/Dockerfile

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,32 @@
55
FROM docker.stackable.tech/stackable/ubi8-rust-builder AS builder
66

77
FROM registry.access.redhat.com/ubi8/ubi-minimal AS operator
8-
LABEL maintainer="Stackable GmbH"
8+
9+
ARG VERSION
10+
ARG RELEASE="1"
11+
12+
LABEL name="Stackable Operator for Apache Spark-on-Kubernetes" \
13+
maintainer="[email protected]" \
14+
vendor="Stackable GmbH" \
15+
version="${VERSION}" \
16+
release="${RELEASE}" \
17+
summary="Deploy and manage Apache Spark-on-Kubernetes clusters." \
18+
description="Deploy and manage Apache Spark-on-Kubernetes clusters."
919

1020
# Update image
11-
RUN microdnf update --disablerepo=* --enablerepo=ubi-8-baseos --enablerepo=ubi-8-baseos -y \
12-
&& rm -rf /var/cache/yum \
13-
&& microdnf install --disablerepo=* --enablerepo=ubi-8-baseos shadow-utils -y \
14-
&& microdnf clean all \
15-
&& rm -rf /var/cache/yum
21+
RUN microdnf install -y yum \
22+
&& yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical \
23+
&& yum clean all \
24+
&& microdnf clean all
25+
26+
COPY LICENSE /licenses/LICENSE
1627

1728
COPY --from=builder /app/stackable-spark-k8s-operator /
1829
COPY deploy/config-spec/properties.yaml /etc/stackable/spark-k8s-operator/config-spec/properties.yaml
1930

2031
RUN groupadd -g 1000 stackable && adduser -u 1000 -g stackable -c 'Stackable Operator' stackable
2132

22-
USER 1000:1000
33+
USER stackable:stackable
2334

2435
ENTRYPOINT ["/stackable-spark-k8s-operator"]
2536
CMD ["run"]

0 commit comments

Comments
 (0)