Skip to content

Commit 2200fa7

Browse files
committed
consolidate fixes
1 parent b96cc30 commit 2200fa7

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

hbase/Dockerfile

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN --mount=type=cache,id=maven-hbase-${PRODUCT},uid=${STACKABLE_USER_UID},targe
4646
###
4747
### HBase
4848
###
49-
curl "https://repo.stackable.tech/repository/packages/hbase/hbase-${PRODUCT}-src.tar.gz" | tar -xzC .
49+
curl --fail "https://repo.stackable.tech/repository/packages/hbase/hbase-${PRODUCT}-src.tar.gz" | tar -xzC .
5050
mv hbase-${PRODUCT} hbase-${PRODUCT}-src
5151

5252
chmod +x patches/apply_patches.sh
@@ -67,7 +67,7 @@ ln -s "/stackable/hbase-${PRODUCT}" /stackable/hbase
6767
### JMX Prometheus Exporter/Agent
6868
###
6969
if [[ -n "${JMX_EXPORTER}" ]] ; then
70-
curl "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
70+
curl --fail "https://repo.stackable.tech/repository/packages/jmx-exporter/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" -o "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
7171
chmod +x "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar"
7272
ln -s "/stackable/jmx/jmx_prometheus_javaagent-${JMX_EXPORTER}.jar" /stackable/jmx/jmx_prometheus_javaagent.jar
7373
fi
@@ -77,7 +77,7 @@ fi
7777
###
7878
cd /stackable
7979
export ARCH="${TARGETARCH/amd64/x64}"
80-
curl "https://repo.stackable.tech/repository/packages/async-profiler/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}.tar.gz" | tar -xzC .
80+
curl --fail "https://repo.stackable.tech/repository/packages/async-profiler/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}.tar.gz" | tar -xzC .
8181
ln -s "/stackable/async-profiler-${ASYNC_PROFILER}-${TARGETOS}-${ARCH}" /stackable/async-profiler
8282

8383
# We're removing these to make the intermediate layer smaller
@@ -89,6 +89,8 @@ if [ "${DELETE_CACHES}" = "true" ] ; then
8989
rm -rf /stackable/.npm/*
9090
rm -rf /stackable/.cache/*
9191
fi
92+
93+
# set correct groups
9294
chmod -R g=u /stackable
9395
EOF
9496

@@ -102,7 +104,6 @@ USER ${STACKABLE_USER_UID}
102104
WORKDIR /stackable
103105

104106
RUN --mount=type=cache,id=maven-opa,uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
105-
106107
###
107108
### OPA Authorizer (only for 2.6 upwards)
108109
###
@@ -120,10 +121,11 @@ else
120121
touch hbase-opa-authorizer/target/hbase-opa-authorizer.jar
121122
fi
122123

123-
124124
if [ "${DELETE_CACHES}" = "true" ] ; then
125125
rm -rf /stackable/.m2/repository/*
126126
fi
127+
128+
# set correct groups
127129
chmod -R g=u /stackable
128130
EOF
129131

@@ -154,7 +156,7 @@ WORKDIR /stackable
154156
# We need to explicitly give the uid to use
155157
RUN --mount=type=cache,id=maven-hbase-operator-tools-${HBASE_OPERATOR_TOOLS},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
156158

157-
curl "https://repo.stackable.tech/repository/packages/hbase-operator-tools/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src.tar.gz" | tar -xzC .
159+
curl --fail "https://repo.stackable.tech/repository/packages/hbase-operator-tools/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src.tar.gz" | tar -xzC .
158160
mv hbase-operator-tools-${HBASE_OPERATOR_TOOLS} hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src
159161
chmod +x patches/apply_patches.sh
160162
patches/apply_patches.sh ${HBASE_OPERATOR_TOOLS} hbase-operator-tools-${HBASE_OPERATOR_TOOLS}-src
@@ -191,6 +193,8 @@ if [ "${DELETE_CACHES}" = "true" ] ; then
191193
rm -rf /stackable/.npm/*
192194
rm -rf /stackable/.cache/*
193195
fi
196+
197+
# set correct groups
194198
chmod -R g=u /stackable
195199
EOF
196200

@@ -223,6 +227,8 @@ export LIBS=$(find /stackable/hadoop/share/hadoop -name '*.jar' -printf '%p:' |
223227
envsubst '${PRODUCT}:${LIBS}' < /stackable/bin/export-snapshot-to-s3.env > /stackable/bin/export-snapshot-to-s3
224228
chmod +x /stackable/bin/export-snapshot-to-s3
225229
rm /stackable/bin/export-snapshot-to-s3.env
230+
231+
# set correct groups
226232
chmod -R g=u /stackable
227233
EOF
228234

@@ -246,7 +252,7 @@ WORKDIR /stackable
246252

247253
RUN --mount=type=cache,id=maven-phoenix-${PHOENIX},uid=${STACKABLE_USER_UID},target=/stackable/.m2/repository <<EOF
248254
cd /stackable
249-
curl "https://repo.stackable.tech/repository/packages/phoenix/phoenix-${PHOENIX}-src.tar.gz" | tar -xzC .
255+
curl --fail "https://repo.stackable.tech/repository/packages/phoenix/phoenix-${PHOENIX}-src.tar.gz" | tar -xzC .
250256
mv phoenix-${PHOENIX} phoenix-${PHOENIX}-src
251257

252258
chmod +x patches/apply_patches.sh
@@ -275,7 +281,6 @@ mv phoenix-${PHOENIX}-src/phoenix-assembly/target/bom.json /stackable/phoenix-${
275281
rm -rf /stackable/phoenix-${PHOENIX}-src
276282
ln -s "/stackable/phoenix-${HBASE_PROFILE}-${PHOENIX}-bin" /stackable/phoenix
277283

278-
279284
# We're removing these to make the intermediate layer smaller
280285
# This can be necessary even though it's only a builder image because the GitHub Action Runners only have very limited space available
281286
# and we are sometimes running into errors because we're out of space.
@@ -285,6 +290,8 @@ if [ "${DELETE_CACHES}" = "true" ] ; then
285290
rm -rf /stackable/.npm/*
286291
rm -rf /stackable/.cache/*
287292
fi
293+
294+
# set correct groups
288295
chmod -R g=u /stackable
289296
EOF
290297

@@ -359,12 +366,17 @@ microdnf install \
359366

360367
microdnf clean all
361368
rpm -qa --qf "%{NAME}-%{VERSION}-%{RELEASE}\n" | sort > /stackable/package_manifest.txt
362-
chmod g=u /stackable/package_manifest.txt
369+
chown ${STACKABLE_USER_UID}:0 /stackable/package_manifest.txt
363370
rm -rf /var/cache/yum
364371

365372
ln --symbolic --logical --verbose "/stackable/hbase-${PRODUCT}" /stackable/hbase
373+
chown -h ${STACKABLE_USER_UID}:0 /stackable/hbase
374+
366375
ln --symbolic --logical --verbose "/stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}" /stackable/hbase-operator-tools
376+
chown -h ${STACKABLE_USER_UID}:0 /stackable/hbase-operator-tools
377+
367378
ln --symbolic --logical --verbose "/stackable/phoenix/phoenix-server-hbase-${HBASE_PROFILE}.jar" "/stackable/hbase/lib/phoenix-server-hbase-${HBASE_PROFILE}.jar"
379+
chown -h ${STACKABLE_USER_UID}:0 "/stackable/hbase/lib/phoenix-server-hbase-${HBASE_PROFILE}.jar"
368380
EOF
369381

370382
# ----------------------------------------

0 commit comments

Comments
 (0)