Skip to content

Fix path substitution in the hbck2 script #498

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

Merged
siegfriedweber merged 1 commit into from
Nov 9, 2023
Merged

Fix path substitution in the hbck2 script #498

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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file.
### Added

- hadoop: Add all necessary components to the image to mount HDFS using FUSE ([#400])
- hbase: Add hbase-operator-tools ([#497]).
- hbase: Add hbase-operator-tools ([#497], [#498]).
- java-base: Add needed tzdata-java package ([#425]).
- testing-tools: Add java, tzdata-java, unzip ([#464], [#465], [#466]).

Expand Down Expand Up @@ -104,6 +104,7 @@ All notable changes to this project will be documented in this file.
[#489]: https://github.com/stackabletech/docker-images/pull/489
[#494]: https://github.com/stackabletech/docker-images/pull/494
[#497]: https://github.com/stackabletech/docker-images/pull/497
[#498]: https://github.com/stackabletech/docker-images/pull/498

## [23.7.0] - 2023-07-14

Expand Down
12 changes: 6 additions & 6 deletions hbase/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# zip required for the log4shell stuff
RUN microdnf update && \
microdnf install \
# The GNU gettext utilities contain the envsubst program which \
# substitutes the values of environment variables. \
# The GNU gettext utilities contain the envsubst program which
# substitutes the values of environment variables.
gettext \
git \
gzip \
Expand Down Expand Up @@ -61,10 +61,10 @@ RUN curl --fail -L "https://repo.stackable.tech/repository/packages/hbase-operat
rm -rf /stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src

# Resolve paths in bin/hbck2
RUN # The variable names are intentionally passed to envsubst in single-quotes, \
# so that they are not expanded. Disable the according ShellCheck rule: \
# shellcheck disable=SC2016 \
mv bin/hbck2 bin/hbck2.env && \
RUN mv bin/hbck2 bin/hbck2.env && \
# The variable names are intentionally passed to envsubst in single-quotes,
# so that they are not expanded. Disabling ShellCheck rules in a Dockerfile
# does not work, so please ignore the according warning (SC2016).
envsubst '${PRODUCT}:${HBASE_OPERATOR_TOOLS}' < bin/hbck2.env > bin/hbck2 && \
chmod +x bin/hbck2 && \
rm bin/hbck2.env
Expand Down