Skip to content

Commit

Permalink
don't delegate to original entrypoint, we don't need to inherit the d…
Browse files Browse the repository at this point in the history
…efaults it assumes
  • Loading branch information
andrewazores committed Jan 22, 2024
1 parent 6c688bd commit 6cffca5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN dnf install -y go git make gettext \
&& popd

FROM registry.access.redhat.com/ubi8/ubi-micro:${runner_version}
COPY --from=builder /usr/bin/envsubst /root/go/bin/weed /root/seaweedfs/docker/entrypoint.sh /usr/bin/
COPY --from=builder /usr/bin/envsubst /root/go/bin/weed /usr/bin/
COPY ./cryostat-entrypoint.bash /usr/bin/
COPY seaweed_conf.template.json /etc/seaweed_conf.template.json
ENTRYPOINT ["/usr/bin/cryostat-entrypoint.bash"]
5 changes: 3 additions & 2 deletions cryostat-entrypoint.bash
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ done

createBuckets "${names[@]}" &

exec /usr/bin/entrypoint.sh \
server -dir="${DATA_DIR:-/tmp}" \
exec weed -logtostderr=true server \
-dir="${DATA_DIR:-/tmp}" \
-master.volumePreallocate -volume.max="${VOLUME_MAX:-0}" -master.volumeSizeLimitMB=4096 \
-s3 -s3.config="${cfg}" \
"$@"

0 comments on commit 6cffca5

Please sign in to comment.