Skip to content

[Improvement-18035][dist] Exclude macOS junk from bin tar.gz for clean Linux extraction #18036

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

Closed
macdoor wants to merge 7 commits into from
+25 −2
Closed

[Improvement-18035][dist] Exclude macOS junk from bin tar.gz for clean Linux extraction #18036

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9cc4f6f
fix(dist): exclude macOS junk from bin tar.gz for Linux extraction
Mar 1, 2026
7c0a55c
fix(dist): exclude macOS junk in assembly and .gitignore per review
Mar 7, 2026
52bee7f
fix(dist): use tar --exclude instead of find/xattr per review
Mar 8, 2026
23118d7
fix(dist): move macOS junk cleanup to each module per review
Mar 9, 2026
9aaa12f
Merge branch 'dev' into fix/dist-macos-tar-linux-extraction
SbloodyS Mar 12, 2026
c988d2f
Merge branch 'dev' into fix/dist-macos-tar-linux-extraction
macdoor Mar 16, 2026
365c4e4
Merge branch 'dev' into fix/dist-macos-tar-linux-extraction
macdoor Mar 17, 2026
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.zip
.gz
.DS_Store
._*
.target
.idea/
!.idea/icon.png
Expand Down
14 changes: 13 additions & 1 deletion dolphinscheduler-dist/src/main/assembly/assembly-plugins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,20 @@ done
# create symbolic link for standalone-server
cd $BIN_DIR/standalone-server && ln -s ../tools/sql/sql sql

# remove macOS junk so Linux extraction is clean
find "$BIN_DIR" -name '._*' -delete
find "$BIN_DIR" -name '.DS_Store' -delete
if [ "$(uname -s)" = "Darwin" ]; then
xattr -cr "$BIN_DIR"
fi

# repack bin tar
BIN_TAR_FILE_NAME=$(basename $BIN_TAR_FILE)
cd $DIST_DIR && tar -zcf $BIN_TAR_FILE_NAME apache-dolphinscheduler-*-bin
cd $DIST_DIR
if [ "$(uname -s)" = "Darwin" ]; then
COPYFILE_DISABLE=1 tar --no-xattrs -zcf $BIN_TAR_FILE_NAME apache-dolphinscheduler-*-bin
else
tar -zcf $BIN_TAR_FILE_NAME apache-dolphinscheduler-*-bin
fi

echo "assembly-plugins.sh done"
68 changes: 68 additions & 0 deletions dolphinscheduler-dist/src/main/assembly/dolphinscheduler-bin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,37 @@
<fileSet>
<directory>${basedir}/../dolphinscheduler-alert/dolphinscheduler-alert-server/target/alert-server</directory>
<outputDirectory>alert-server</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/../dolphinscheduler-api/target/api-server</directory>
<outputDirectory>api-server</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/../dolphinscheduler-master/target/master-server</directory>
<outputDirectory>master-server</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/../dolphinscheduler-worker/target/worker-server</directory>
<outputDirectory>worker-server</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<!-- plugins -->
Expand All @@ -53,6 +69,10 @@
<include>dolphinscheduler-alert-*/target/dolphinscheduler-alert-*-shade.jar</include>
</includes>
<outputDirectory>plugins/alert-plugins</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
Expand All @@ -61,6 +81,10 @@
<include>dolphinscheduler-datasource-*/target/dolphinscheduler-datasource-*-shade.jar</include>
</includes>
<outputDirectory>plugins/datasource-plugins</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
Expand All @@ -69,6 +93,10 @@
<include>dolphinscheduler-task-*/target/dolphinscheduler-task-*-shade.jar</include>
</includes>
<outputDirectory>plugins/task-plugins</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
Expand All @@ -77,39 +105,67 @@
<include>dolphinscheduler-storage-*/target/dolphinscheduler-storage-*-shade.jar</include>
</includes>
<outputDirectory>plugins/storage-plugins</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>
<!-- plugins -->

<fileSet>
<directory>${basedir}/../dolphinscheduler-standalone-server/target/standalone-server</directory>
<outputDirectory>standalone-server</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/../dolphinscheduler-tools/target/tools</directory>
<outputDirectory>tools</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/../dolphinscheduler-dist/target/dolphinscheduler-dist-${project.version}</directory>
<outputDirectory>.</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/../dolphinscheduler-ui/dist</directory>
<outputDirectory>./ui</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/../script</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
<directoryMode>0755</directoryMode>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/../config</directory>
<outputDirectory>conf</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
Expand All @@ -120,16 +176,28 @@
</includes>
<fileMode>0755</fileMode>
<outputDirectory>.</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/../.mvn/</directory>
<outputDirectory>.mvn</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>${basedir}/release-docs</directory>
<outputDirectory>.</outputDirectory>
<excludes>
<exclude>**/._*</exclude>
<exclude>**/.DS_Store</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>