Skip to content
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

[OPENJDK-2824] assemble: binary: Don't set times on directories (UBI8) #484

Merged
merged 2 commits into from
Apr 15, 2024
Merged

[OPENJDK-2824] assemble: binary: Don't set times on directories (UBI8) #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be9e76d
[OPENJDK-2824] Test binary-s2i on a non-owned directory
jmtd Apr 2, 2024
347382c
[OPENJDK-2824] assemble: binary: Don't set times on directories
jmtd Mar 27, 2024
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
7 changes: 6 additions & 1 deletion modules/s2i/bash/artifacts/opt/jboss/container/java/s2i/maven-s2i-overrides
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ function maven_s2i_custom_binary_build() {
binary_dir="${S2I_SOURCE_DIR}"
fi
log_info "Copying binaries from ${binary_dir} to ${S2I_TARGET_DEPLOYMENTS_DIR} ..."
rsync --archive --out-format='%n' "${binary_dir}"/ "${S2I_TARGET_DEPLOYMENTS_DIR}"

( # OPENJDK-2850: use glob (dotglob to match hidden files) to stop rsync altering
# timestamps of S2I_TARGET_DEPLOYMENTS_DIR. Don't alter parent shell's dotglob.
shopt -s dotglob
rsync --archive --out-format='%n' "${binary_dir}"/* "${S2I_TARGET_DEPLOYMENTS_DIR}"
)
}

function maven_s2i_deploy_artifacts_override() {
Expand Down
11 changes: 11 additions & 0 deletions modules/s2i/core/api/tests/features/s2i-core.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,14 @@ Feature: Openshift S2I tests
Scenario: run an s2i build and check that /tmp/src has been removed afterwards
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from spring-boot-sample-simple
Then run stat /tmp/src in container and immediately check its output does not contain File:

# OPENJDK-2824 - ensure binary-only s2i doesn't try to change timestamps of
# S2I_TARGET_DEPLOYMENTS_DIR. Use /var/tmp as a directory where attempting to
# will fail. This simulates the s2i process running as a random UID, which can't
# change timestamps on the default directory, /deployments.
Scenario: Ensure binary-only build doesn't fail trying to set timestamp of S2I_TARGET_DEPLOYMENTS_DIR (OPENJDK-2850)
Given s2i build https://github.com/jboss-container-images/openjdk-test-applications from OPENJDK-2408-bin-custom-s2i-assemble with env
| variable | value |
| S2I_TARGET_DEPLOYMENTS_DIR | /var/tmp |
Then s2i build log should not contain rsync: [generator] failed to set permissions on "/var/tmp/.": Operation not permitted
And run stat /var/tmp/spring-boot-sample-simple-1.5.0.BUILD-SNAPSHOT.jar in container and check its output for Access:
Loading