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 nextcloud image #4684

Merged
merged 1 commit into from
Aug 3, 2018
Merged

Conversation

@tilosp tilosp mentioned this pull request Aug 3, 2018
@tilosp
Copy link
Contributor

tilosp commented Aug 3, 2018

It looks like Jenkins is using a different collation. But this should only be a problem on the first pr.

@tianon
Copy link
Member

tianon commented Aug 3, 2018

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 2801fc7..391f06e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -30,10 +30,10 @@ nextcloud:14.0-beta
 nextcloud:14.0-beta-apache
 nextcloud:14.0-beta-fpm
 nextcloud:14.0-beta-fpm-alpine
-nextcloud:14.0.0beta1
-nextcloud:14.0.0beta1-apache
-nextcloud:14.0.0beta1-fpm
-nextcloud:14.0.0beta1-fpm-alpine
+nextcloud:14.0.0beta2
+nextcloud:14.0.0beta2-apache
+nextcloud:14.0.0beta2-fpm
+nextcloud:14.0.0beta2-fpm-alpine
 nextcloud:14.0.0-beta
 nextcloud:14.0.0-beta-apache
 nextcloud:14.0.0-beta-fpm
diff --git a/nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/Dockerfile b/nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
similarity index 100%
rename from nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/Dockerfile
rename to nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
diff --git a/nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apache-pretty-urls.config.php b/nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apache-pretty-urls.config.php
rename to nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apache-pretty-urls.config.php
diff --git a/nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apcu.config.php b/nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
similarity index 100%
rename from nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apcu.config.php
rename to nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
diff --git a/nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apps.config.php b/nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
similarity index 100%
rename from nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apps.config.php
rename to nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
diff --git a/nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/autoconfig.php b/nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
similarity index 100%
rename from nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/autoconfig.php
rename to nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
diff --git a/nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/cron.sh b/nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
similarity index 100%
rename from nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/cron.sh
rename to nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh b/nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
similarity index 87%
copy from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh
copy to nextcloud_12.0.10-apache_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
index 8f3ac08..2ad63ec 100755
diff --git a/nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/Dockerfile b/nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
similarity index 100%
rename from nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/Dockerfile
rename to nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
diff --git a/nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apcu.config.php b/nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
similarity index 100%
rename from nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apcu.config.php
rename to nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
diff --git a/nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apps.config.php b/nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
similarity index 100%
rename from nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apps.config.php
rename to nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
diff --git a/nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/autoconfig.php b/nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
similarity index 100%
rename from nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/autoconfig.php
rename to nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
diff --git a/nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/cron.sh b/nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
similarity index 100%
rename from nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/cron.sh
rename to nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
diff --git a/nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh b/nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
similarity index 87%
rename from nextcloud_12.0.10-apache_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh
rename to nextcloud_12.0.10-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
index 8f3ac08..2ad63ec 100755
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/Dockerfile b/nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
similarity index 100%
rename from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/Dockerfile
rename to nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apcu.config.php b/nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
similarity index 100%
rename from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apcu.config.php
rename to nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apps.config.php b/nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
similarity index 100%
rename from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/apps.config.php
rename to nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/autoconfig.php b/nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
similarity index 100%
rename from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/config/autoconfig.php
rename to nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/cron.sh b/nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
similarity index 100%
rename from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/cron.sh
rename to nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
diff --git a/nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh b/nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
similarity index 87%
rename from nextcloud_12.0.10-fpm-alpine_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh
rename to nextcloud_12.0.10-fpm_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
index 8f3ac08..2ad63ec 100755
diff --git a/nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/Dockerfile b/nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
similarity index 100%
rename from nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/Dockerfile
rename to nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
diff --git a/nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apache-pretty-urls.config.php b/nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apache-pretty-urls.config.php
rename to nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apache-pretty-urls.config.php
diff --git a/nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apcu.config.php b/nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
similarity index 100%
rename from nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apcu.config.php
rename to nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
diff --git a/nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apps.config.php b/nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
similarity index 100%
rename from nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apps.config.php
rename to nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
diff --git a/nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/autoconfig.php b/nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
similarity index 100%
rename from nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/autoconfig.php
rename to nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
diff --git a/nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/cron.sh b/nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
similarity index 100%
rename from nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/cron.sh
rename to nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
diff --git a/nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/entrypoint.sh b/nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
similarity index 87%
rename from nextcloud_13.0.5-apache_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/entrypoint.sh
rename to nextcloud_13.0.5-apache_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
index 8f3ac08..2ad63ec 100755
diff --git a/nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/Dockerfile b/nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
similarity index 100%
rename from nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/Dockerfile
rename to nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
diff --git a/nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apcu.config.php b/nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
similarity index 100%
rename from nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apcu.config.php
rename to nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
diff --git a/nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apps.config.php b/nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
similarity index 100%
rename from nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apps.config.php
rename to nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
diff --git a/nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/autoconfig.php b/nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
similarity index 100%
rename from nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/autoconfig.php
rename to nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
diff --git a/nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/cron.sh b/nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
similarity index 100%
rename from nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/cron.sh
rename to nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh b/nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
similarity index 87%
copy from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh
copy to nextcloud_13.0.5-fpm-alpine_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
index 8f3ac08..2ad63ec 100755
diff --git a/nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/entrypoint.sh b/nextcloud_13.0.5-fpm-alpine_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/entrypoint.sh
deleted file mode 100755
index 8f3ac08..0000000
diff --git a/nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/Dockerfile b/nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
similarity index 100%
rename from nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/Dockerfile
rename to nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/Dockerfile
diff --git a/nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apcu.config.php b/nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
similarity index 100%
rename from nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apcu.config.php
rename to nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/apcu.config.php
diff --git a/nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apps.config.php b/nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
similarity index 100%
rename from nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/apps.config.php
rename to nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/apps.config.php
diff --git a/nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/autoconfig.php b/nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
similarity index 100%
rename from nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/config/autoconfig.php
rename to nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/config/autoconfig.php
diff --git a/nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/cron.sh b/nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
similarity index 100%
rename from nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/cron.sh
rename to nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/cron.sh
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh b/nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
similarity index 87%
copy from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh
copy to nextcloud_13.0.5-fpm_328b7f334fdfec69f4985e609386613470af87fa/entrypoint.sh
index 8f3ac08..2ad63ec 100755
diff --git a/nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/entrypoint.sh b/nextcloud_13.0.5-fpm_b0c5b58f5866442904d73063ef3dc4bf18ecf1f2/entrypoint.sh
deleted file mode 100755
index 8f3ac08..0000000
diff --git a/nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/entrypoint.sh b/nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/entrypoint.sh
deleted file mode 100755
index 8f3ac08..0000000
diff --git a/nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/entrypoint.sh b/nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/entrypoint.sh
deleted file mode 100755
index 8f3ac08..0000000
diff --git a/nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/entrypoint.sh b/nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/entrypoint.sh
deleted file mode 100755
index 8f3ac08..0000000
diff --git a/nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/Dockerfile b/nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/Dockerfile
similarity index 99%
rename from nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/Dockerfile
rename to nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/Dockerfile
index ff6f11a..81f6414 100644
--- a/nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/Dockerfile
+++ b/nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/Dockerfile
@@ -103,7 +103,7 @@ RUN a2enmod rewrite remoteip ;\
     } > /etc/apache2/conf-available/remoteip.conf;\
     a2enconf remoteip
 
-ENV NEXTCLOUD_VERSION 14.0.0beta1
+ENV NEXTCLOUD_VERSION 14.0.0beta2
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apache-pretty-urls.config.php b/nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apache-pretty-urls.config.php
similarity index 100%
rename from nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apache-pretty-urls.config.php
rename to nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apache-pretty-urls.config.php
diff --git a/nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apcu.config.php b/nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apcu.config.php
similarity index 100%
rename from nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apcu.config.php
rename to nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apcu.config.php
diff --git a/nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apps.config.php b/nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apps.config.php
similarity index 100%
rename from nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apps.config.php
rename to nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apps.config.php
diff --git a/nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/autoconfig.php b/nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/autoconfig.php
similarity index 100%
rename from nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/autoconfig.php
rename to nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/autoconfig.php
diff --git a/nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/cron.sh b/nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/cron.sh
similarity index 100%
rename from nextcloud_14.0.0beta1-apache_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/cron.sh
rename to nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/cron.sh
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh b/nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/entrypoint.sh
similarity index 87%
copy from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh
copy to nextcloud_14.0.0beta2-apache_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/entrypoint.sh
index 8f3ac08..2ad63ec 100755
diff --git a/nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/Dockerfile b/nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/Dockerfile
similarity index 99%
rename from nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/Dockerfile
rename to nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/Dockerfile
index d4e64e1..ff97e7a 100644
--- a/nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/Dockerfile
+++ b/nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/Dockerfile
@@ -84,7 +84,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 14.0.0beta1
+ENV NEXTCLOUD_VERSION 14.0.0beta2
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
diff --git a/nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apcu.config.php b/nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apcu.config.php
similarity index 100%
rename from nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apcu.config.php
rename to nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apcu.config.php
diff --git a/nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apps.config.php b/nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apps.config.php
similarity index 100%
rename from nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apps.config.php
rename to nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apps.config.php
diff --git a/nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/autoconfig.php b/nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/autoconfig.php
similarity index 100%
rename from nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/autoconfig.php
rename to nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/autoconfig.php
diff --git a/nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/cron.sh b/nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/cron.sh
similarity index 100%
rename from nextcloud_14.0.0beta1-fpm-alpine_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/cron.sh
rename to nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/cron.sh
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh b/nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/entrypoint.sh
similarity index 87%
copy from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh
copy to nextcloud_14.0.0beta2-fpm-alpine_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/entrypoint.sh
index 8f3ac08..2ad63ec 100755
diff --git a/nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/Dockerfile b/nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/Dockerfile
similarity index 99%
rename from nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/Dockerfile
rename to nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/Dockerfile
index da03f8a..e434e76 100644
--- a/nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/Dockerfile
+++ b/nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/Dockerfile
@@ -95,7 +95,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 14.0.0beta1
+ENV NEXTCLOUD_VERSION 14.0.0beta2
 
 RUN set -ex; \
     fetchDeps=" \
diff --git a/nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apcu.config.php b/nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apcu.config.php
similarity index 100%
rename from nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apcu.config.php
rename to nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apcu.config.php
diff --git a/nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apps.config.php b/nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apps.config.php
similarity index 100%
rename from nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/apps.config.php
rename to nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/apps.config.php
diff --git a/nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/autoconfig.php b/nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/autoconfig.php
similarity index 100%
rename from nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/config/autoconfig.php
rename to nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/config/autoconfig.php
diff --git a/nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/cron.sh b/nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/cron.sh
similarity index 100%
rename from nextcloud_14.0.0beta1-fpm_7f91a3a23306510dea7ee8e970be6fe1df5ddad7/cron.sh
rename to nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/cron.sh
diff --git a/nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh b/nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/entrypoint.sh
similarity index 87%
rename from nextcloud_12.0.10-fpm_66fcf0ba1f7e644093b025d85ada1a9ad0dc9b68/entrypoint.sh
rename to nextcloud_14.0.0beta2-fpm_31878f1f57a09e1603d62ddfc5b47ba4c7fb0d99/entrypoint.sh
index 8f3ac08..2ad63ec 100755

@tianon
Copy link
Member

tianon commented Aug 3, 2018

LGTM

Build test of #4684; dde5a7e; amd64 (nextcloud):

$ bashbrew build nextcloud:12.0.10-apache
Using bashbrew/cache:499a856e177f50005d247f497ecc21ee413ef8403fcc86380e24c0d85f26ea93 (nextcloud:12.0.10-apache)
Tagging nextcloud:12.0.10-apache
Tagging nextcloud:12.0-apache
Tagging nextcloud:12-apache
Tagging nextcloud:12.0.10
Tagging nextcloud:12.0
Tagging nextcloud:12

$ test/run.sh nextcloud:12.0.10-apache
testing nextcloud:12.0.10-apache
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nextcloud:12.0.10-fpm-alpine
Using bashbrew/cache:57b7a222dbeb477df5e0df89ee01160c2670211c0a0983ca4eea73effe36acd7 (nextcloud:12.0.10-fpm-alpine)
Tagging nextcloud:12.0.10-fpm-alpine
Tagging nextcloud:12.0-fpm-alpine
Tagging nextcloud:12-fpm-alpine

$ test/run.sh nextcloud:12.0.10-fpm-alpine
testing nextcloud:12.0.10-fpm-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nextcloud:12.0.10-fpm
Using bashbrew/cache:7281ba4ace1c91a8d145976ff4f448e5e1b28fa49f8a0992a861b713e28c2fe6 (nextcloud:12.0.10-fpm)
Tagging nextcloud:12.0.10-fpm
Tagging nextcloud:12.0-fpm
Tagging nextcloud:12-fpm

$ test/run.sh nextcloud:12.0.10-fpm
testing nextcloud:12.0.10-fpm
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nextcloud:13.0.5-apache
Using bashbrew/cache:cc087022c3b890e3e69cd69039f22ac4da26e116549672753f343db0df8835d2 (nextcloud:13.0.5-apache)
Tagging nextcloud:13.0.5-apache
Tagging nextcloud:13.0-apache
Tagging nextcloud:13-apache
Tagging nextcloud:apache
Tagging nextcloud:stable-apache
Tagging nextcloud:13.0.5
Tagging nextcloud:13.0
Tagging nextcloud:13
Tagging nextcloud:latest
Tagging nextcloud:stable

$ test/run.sh nextcloud:13.0.5-apache
testing nextcloud:13.0.5-apache
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nextcloud:13.0.5-fpm-alpine
Using bashbrew/cache:8d552ca7fc6108ceb0efed937b9887e784753427427da9aa81c5a5dd67288d4d (nextcloud:13.0.5-fpm-alpine)
Tagging nextcloud:13.0.5-fpm-alpine
Tagging nextcloud:13.0-fpm-alpine
Tagging nextcloud:13-fpm-alpine
Tagging nextcloud:fpm-alpine
Tagging nextcloud:stable-fpm-alpine

$ test/run.sh nextcloud:13.0.5-fpm-alpine
testing nextcloud:13.0.5-fpm-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nextcloud:13.0.5-fpm
Using bashbrew/cache:554f1fdd7640645bf700b1ea1ff74bf1b37822831c4e37575f5ad81c55744d28 (nextcloud:13.0.5-fpm)
Tagging nextcloud:13.0.5-fpm
Tagging nextcloud:13.0-fpm
Tagging nextcloud:13-fpm
Tagging nextcloud:fpm
Tagging nextcloud:stable-fpm

$ test/run.sh nextcloud:13.0.5-fpm
testing nextcloud:13.0.5-fpm
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nextcloud:14.0.0beta2-apache
Using bashbrew/cache:a97ae06610b3763a82290219970abc2a2100560f4e6d21b1ed67d35ea679b4a7 (nextcloud:14.0.0beta2-apache)
Tagging nextcloud:14.0.0beta2-apache
Tagging nextcloud:14.0.0-beta-apache
Tagging nextcloud:14.0-beta-apache
Tagging nextcloud:14-beta-apache
Tagging nextcloud:beta-apache
Tagging nextcloud:14.0.0beta2
Tagging nextcloud:14.0.0-beta
Tagging nextcloud:14.0-beta
Tagging nextcloud:14-beta
Tagging nextcloud:beta

$ test/run.sh nextcloud:14.0.0beta2-apache
testing nextcloud:14.0.0beta2-apache
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nextcloud:14.0.0beta2-fpm-alpine
Using bashbrew/cache:09b11e39629eebb128ef576bb376ee26717dac4e823cd931a5314d282951230c (nextcloud:14.0.0beta2-fpm-alpine)
Tagging nextcloud:14.0.0beta2-fpm-alpine
Tagging nextcloud:14.0.0-beta-fpm-alpine
Tagging nextcloud:14.0-beta-fpm-alpine
Tagging nextcloud:14-beta-fpm-alpine
Tagging nextcloud:beta-fpm-alpine

$ test/run.sh nextcloud:14.0.0beta2-fpm-alpine
testing nextcloud:14.0.0beta2-fpm-alpine
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build nextcloud:14.0.0beta2-fpm
Using bashbrew/cache:098c52b11971a65c44928421bd8891dcda7223eacebdc84dbcc140c6d49e12fa (nextcloud:14.0.0beta2-fpm)
Tagging nextcloud:14.0.0beta2-fpm
Tagging nextcloud:14.0.0-beta-fpm
Tagging nextcloud:14.0-beta-fpm
Tagging nextcloud:14-beta-fpm
Tagging nextcloud:beta-fpm

$ test/run.sh nextcloud:14.0.0beta2-fpm
testing nextcloud:14.0.0beta2-fpm
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit 6c1aa29 into docker-library:master Aug 3, 2018
@tilosp-bot tilosp-bot deleted the bot/nextcloud branch August 3, 2018 20:49
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.

4 participants