Skip to content

Commit 83310eb

Browse files
committed
Merge branch 'main' into feat/user-handling-pt3
# Conflicts: # CHANGELOG.md # hive/Dockerfile # kafka/Dockerfile # nifi/Dockerfile # omid/Dockerfile # opa/Dockerfile # spark-k8s/Dockerfile
2 parents 502b864 + 45cbe54 commit 83310eb

File tree

25 files changed

+314
-60
lines changed

25 files changed

+314
-60
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nix/** linguist-generated

.github/ISSUE_TEMPLATE/add-product.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ assignees: ''
2323
- [ ] Add a new `dev_<PRODUCT>.yml` GitHub Action workflow in the
2424
`.github/workflows` folder. Use existing local action whenever possible
2525
or consider creating a new one when there is no fitting action available.
26+
- [ ] Run `.scripts/update_readme_badges.sh` to generate the new status badge.
2627
```
2728

2829
_Please consider updating this template if these instructions are wrong, or

CHANGELOG.md

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file.
1616
- trino: Add version `455` ([#822]).
1717
- trino-cli: Add version `455` ([#822]).
1818
- spark: Add version `3.5.2` ([#848]).
19-
- statsd-exporter: Bump version to 0.27.1 ([#866], [#879]).
19+
- statsd-exporter: Bump version to `0.27.1` ([#866], [#879]).
2020
- hadoop: Add patch "HADOOP-18516: Support Fixed SAS Token for ABFS Authentication" ([#852]).
2121
- hbase: Add hadoop-azure.jar to the lib directory to support the Azure Blob Filesystem and
2222
the Azure Data Lake Storage ([#853]).
@@ -27,9 +27,11 @@ All notable changes to this project will be documented in this file.
2727

2828
- ci: Rename local actions, adjust action inputs and outputs, add definition
2929
README file ([#819]).
30-
- Update cargo-cyclonedx to 0.5.5 and build CycloneDX 1.5 files ([#783])
31-
- Enable [Docker build checks](https://docs.docker.com/build/checks/) ([#872])
32-
- Make username, user id, group id configurable, use numeric ids everywhere, change group of all files to 0 ([#849], [#890])
30+
- Update cargo-cyclonedx to 0.5.5 and build CycloneDX 1.5 files ([#783]).
31+
- Enable [Docker build checks](https://docs.docker.com/build/checks/) ([#872]).
32+
- java: migrate to temurin jdk/jre ([#894]).
33+
- tools: bump kubectl to `1.31.1` and jq to `1.7.1` ([#896]).
34+
- Make username, user id, group id configurable, use numeric ids everywhere, change group of all files to 0 ([#849], [#890]).
3335

3436
### Removed
3537

@@ -39,13 +41,14 @@ All notable changes to this project will be documented in this file.
3941
- kafka: Remove versions `3.4.1`, `3.6.1`, `3.6.2` ([#813]).
4042
- trino: Remove versions `414`, `442` ([#822]).
4143
- trino-cli: Remove version `451` ([#822]).
42-
- hbase: Remove 2.4.17 ([#846]).
43-
- omid: Remove 1.1.0 and 1.1.1 ([#846]).
44-
- spark: Remove 3.4.2 and 3.4.3 ([#848]).
45-
- statsd-exporter: Remove 0.26.1 ([#866]).
46-
- superset: Remove 2.1.3, 3.1.0 and 3.1.3 ([#866]).
47-
- zookeeper: Remove 3.8.4 ([#851]).
48-
- nifi: Remove 1.21.0 and 1.25.0 ([#868]).
44+
- hbase: Remove `2.4.17` ([#846]).
45+
- omid: Remove `1.1.0` and `1.1.1` ([#846]).
46+
- spark: Remove `3.4.2` and `3.4.3` ([#848]).
47+
- statsd-exporter: Remove `0.26.1` ([#866]).
48+
- superset: Remove `2.1.3`, `3.1.0` and `3.1.3` ([#866]).
49+
- zookeeper: Remove `3.8.4` ([#851]).
50+
- nifi: Remove `1.21.0` and `1.25.0` ([#868]).
51+
- druid: Remove `28.0.1` ([#880]).
4952

5053
### Fixed
5154

@@ -76,9 +79,12 @@ All notable changes to this project will be documented in this file.
7679
[#877]: https://github.com/stackabletech/docker-images/pull/877
7780
[#878]: https://github.com/stackabletech/docker-images/pull/878
7881
[#879]: https://github.com/stackabletech/docker-images/pull/879
82+
[#880]: https://github.com/stackabletech/docker-images/pull/880
7983
[#881]: https://github.com/stackabletech/docker-images/pull/881
8084
[#882]: https://github.com/stackabletech/docker-images/pull/882
8185
[#890]: https://github.com/stackabletech/docker-images/pull/890
86+
[#894]: https://github.com/stackabletech/docker-images/pull/894
87+
[#896]: https://github.com/stackabletech/docker-images/pull/896
8288

8389
## [24.7.0] - 2024-07-24
8490

druid/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ ln -s /stackable/apache-druid-${PRODUCT} /stackable/druid
120120
# Force to overwrite the existing 'run-druid'
121121
ln -sf /stackable/bin/run-druid /stackable/druid/bin/run-druid
122122

123-
# All files and folders owned by root to support running as arbitrary users
124-
# This is best practice as all container users will belong to the root group (0)
123+
# All files and folders owned by root group to support running as arbitrary users.
124+
# This is best practice as all container users will belong to the root group (0).
125125
chown -R ${STACKABLE_USER_UID}:0 /stackable
126126
chmod -R g=u /stackable
127127
EOF

druid/versions.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@
55
"java-devel": "11",
66
"authorizer": "0.5.0",
77
},
8-
{
9-
"product": "28.0.1",
10-
# Java 17 should be fully supported as of 27.0.0 https://github.com/apache/druid/releases#27.0.0-highlights-java-17-support
11-
# Did not work in a quick test due to reflection error:
12-
# Caused by: java.lang.reflect.InaccessibleObjectException: Unable to make protected final java.lang.Class
13-
# java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws java.lang.ClassFormatError
14-
"java-base": "11",
15-
"java-devel": "11",
16-
"authorizer": "0.5.0",
17-
},
188
{
199
"product": "30.0.0",
2010
# https://druid.apache.org/docs/30.0.0/operations/java/

hadoop/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ find . -name 'hadoop-*tests.jar' -type f -delete
169169
# It is so non-root users (as we are) can mount a FUSE device and let other users access it
170170
echo "user_allow_other" > /etc/fuse.conf
171171

172-
# All files and folders owned by root to support running as arbitrary users
173-
# This is best practice as all container users will belong to the root group (0)
172+
# All files and folders owned by root group to support running as arbitrary users.
173+
# This is best practice as all container users will belong to the root group (0).
174174
chown -R ${STACKABLE_USER_UID}:0 /stackable
175175
chmod -R g=u /stackable
176176
EOF

hbase/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ ln --symbolic --logical --verbose "/stackable/hbase-${PRODUCT}" /stackable/hbase
354354
ln --symbolic --logical --verbose "/stackable/hbase-operator-tools-${HBASE_OPERATOR_TOOLS}" /stackable/hbase-operator-tools
355355
ln --symbolic --logical --verbose "/stackable/phoenix/phoenix-server-hbase-${HBASE_PROFILE}.jar" "/stackable/hbase/lib/phoenix-server-hbase-${HBASE_PROFILE}.jar"
356356

357-
# All files and folders owned by root to support running as arbitrary users
358-
# This is best practice as all container users will belong to the root group (0)
357+
# All files and folders owned by root group to support running as arbitrary users.
358+
# This is best practice as all container users will belong to the root group (0).
359359
chown -R ${STACKABLE_USER_UID}:0 /stackable
360360
chmod -R g=u /stackable
361361
EOF

hello-world/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ rm -rf /var/cache/yum
2222

2323
curl "https://repo.stackable.tech/repository/packages/hello-world/hello-world-${PRODUCT}.jar" -o /stackable/hello-world.jar
2424

25-
# All files and folders owned by root to support running as arbitrary users
26-
# This is best practice as all container users will belong to the root group (0)
25+
# All files and folders owned by root group to support running as arbitrary users.
26+
# This is best practice as all container users will belong to the root group (0).
2727
chown -R ${STACKABLE_USER_UID}:0 /stackable
2828
chmod -R g=u /stackable
2929
EOF

hive/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ cp /stackable/hadoop/share/hadoop/tools/lib/hadoop-azure-${HADOOP}.jar /stackabl
133133
cp /stackable/hadoop/share/hadoop/tools/lib/azure-storage-${AZURE_STORAGE}.jar /stackable/hive-metastore/lib/
134134
cp /stackable/hadoop/share/hadoop/tools/lib/azure-keyvault-core-${AZURE_KEYVAULT_CORE}.jar /stackable/hive-metastore/lib/
135135

136-
# All files and folders owned by root to support running as arbitrary users
137-
# This is best practice as all container users will belong to the root group (0)
136+
# All files and folders owned by root group to support running as arbitrary users.
137+
# This is best practice as all container users will belong to the root group (0).
138138
chown -R ${STACKABLE_USER_UID}:0 /stackable
139139
chmod -R g=u /stackable
140140
EOF

hive/versions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"jmx_exporter": "1.0.1",
55
# Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
66
"java-base": "11",
7-
"java-devel": "1.8.0",
7+
"java-devel": "8",
88
"hadoop": "3.3.6",
99
# Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
1010
"aws_java_sdk_bundle": "1.12.367",
@@ -16,7 +16,7 @@
1616
"jmx_exporter": "1.0.1",
1717
# Hive 3 must be built with Java 8 but will run on Java 11
1818
"java-base": "11",
19-
"java-devel": "1.8.0",
19+
"java-devel": "8",
2020
"hadoop": "3.3.6",
2121
# Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
2222
"aws_java_sdk_bundle": "1.12.367",

0 commit comments

Comments
 (0)