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.

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

Update open-liberty #8011

Merged
merged 1 commit into from
May 15, 2020
Merged

Update open-liberty #8011

merged 1 commit into from
May 15, 2020

Conversation

arthurdm
Copy link
Contributor

Some edge cases were discovered, which required a small update to our build script.

@github-actions
Copy link

Diff for aa65173:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 00fdf8b..e5ed8ac 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Chris Potter <crpotter@us.ibm.com> (@crpotter), Wendy Raschke <wraschke@us.ibm.com> (@wraschke), Arthur De Magalhaes <arthurdm@ca.ibm.com> (@arthurdm)
 Architectures: amd64, i386, ppc64le, s390x
 GitRepo: https://github.com/OpenLiberty/ci.docker.git
-GitCommit: b8559999ed75459d2525285a73ec22b507e18d8a
+GitCommit: 17276f4286810d86d3a067c34dd60a06cfdb2c35
 
 Tags: 19.0.0.12-kernel-java8-openj9
 Architectures: amd64, ppc64le, s390x
diff --git a/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/populate_scc.sh
index 37b0816..e66baf4 100755
--- a/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/populate_scc.sh
+++ b/open-liberty_20.0.0.5-kernel-java8-openj9/helpers/build/populate_scc.sh
@@ -99,7 +99,7 @@ rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /
 
 if [[ -d "/output/resources" ]]
 then
-    chmod -R g+rwx /output/resources/*
+    chmod -R g+rwx /output/resources
 fi
 unset IBM_JAVA_OPTIONS
 # Tell the user how full the final layer is.
diff --git a/open-liberty_kernel-java8-openj9/helpers/build/populate_scc.sh b/open-liberty_kernel-java8-openj9/helpers/build/populate_scc.sh
index 5b1bb13..a967639 100755
--- a/open-liberty_kernel-java8-openj9/helpers/build/populate_scc.sh
+++ b/open-liberty_kernel-java8-openj9/helpers/build/populate_scc.sh
@@ -99,7 +99,7 @@ rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /
 
 if [[ -d "/output/resources" ]]
 then
-    chmod -R g+rwx /output/resources/*
+    chmod -R g+rwx /output/resources
 fi
 
 unset IBM_JAVA_OPTIONS

@arthurdm
Copy link
Contributor Author

@tianon - when you get a chance, can you please take a peak into this one? small PR, but blocking some usage unfortunately.

@yosifkit
Copy link
Member

Apologies for the delay and for not mentioning this earlier. We merged security updates to PHP and Debian yesterday. Build queues are still quite full, so this may take a while to be built.

LGTM

@yosifkit yosifkit merged commit 981f0dc into docker-library:master May 15, 2020
@arthurdm
Copy link
Contributor Author

thanks @yosifkit!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants