From 3b44d225fead7646fee7edcf9db2dba892ed23a2 Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 13 Apr 2021 00:52:24 +0300 Subject: [PATCH 1/2] reamde fix --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ce77a882..94e942d31 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ -# [![GHA](https://img.shields.io/github/workflow/status/EpicMorg/docker-scripts/master/master?label=build%20master&style=flat-square)](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) [![GHA](https://img.shields.io/github/workflow/status/EpicMorg/docker-scripts/develop/develop?label=build%20develop&style=flat-square)](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Adevelop) [![Activity](https://img.shields.io/github/commit-activity/m/EpicMorg/docker-scripts?label=commits&style=flat-square)](https://github.com/EpicMorg/docker-scripts/commits) [![GitHub issues](https://img.shields.io/github/issues/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/issues) [![GitHub forks](https://img.shields.io/github/forks/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/network) [![GitHub stars](https://img.shields.io/github/stars/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/stargazers) [![Size](https://img.shields.io/github/repo-size/EpicMorg/docker-scripts?label=size&style=flat-square)](https://github.com/EpicMorg/docker-scripts/archive/master.zip) [![Release](https://img.shields.io/github/v/release/EpicMorg/docker-scripts?style=flat-square)](https://github.com/EpicMorg/docker-scripts/releases) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3658/badge)](https://bestpractices.coreinfrastructure.org/projects/3658) [![CodeScene System Mastery](https://codescene.io/projects/6535/status-badges/system-mastery)](https://codescene.io/projects/6535) [![GitHub license](https://img.shields.io/github/license/EpicMorg/docker-scripts.svg?style=popout-square)](LICENSE.md) [![Changelog](https://img.shields.io/badge/Changelog-yellow.svg?style=popout-square)](CHANGELOG.md) +# [![Activity](https://img.shields.io/github/commit-activity/m/EpicMorg/docker-scripts?label=commits&style=flat-square)](https://github.com/EpicMorg/docker-scripts/commits) [![GitHub issues](https://img.shields.io/github/issues/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/issues) [![GitHub forks](https://img.shields.io/github/forks/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/network) [![GitHub stars](https://img.shields.io/github/stars/EpicMorg/docker-scripts.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/stargazers) [![Size](https://img.shields.io/github/repo-size/EpicMorg/docker-scripts?label=size&style=flat-square)](https://github.com/EpicMorg/docker-scripts/archive/master.zip) [![Release](https://img.shields.io/github/v/release/EpicMorg/docker-scripts?style=flat-square)](https://github.com/EpicMorg/docker-scripts/releases) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3658/badge)](https://bestpractices.coreinfrastructure.org/projects/3658) [![CodeScene System Mastery](https://codescene.io/projects/6535/status-badges/system-mastery)](https://codescene.io/projects/6535) [![GitHub license](https://img.shields.io/github/license/EpicMorg/docker-scripts.svg?style=popout-square)](LICENSE.md) [![Changelog](https://img.shields.io/badge/Changelog-yellow.svg?style=popout-square)](CHANGELOG.md) +| Master | Develop | +|:-------------|:-------------| +| [![GHA](https://img.shields.io/github/workflow/status/EpicMorg/docker-scripts/master-linux/master?label=build%20master-linux&style=flat-square)](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster-linux) | [![GHA](https://img.shields.io/github/workflow/status/EpicMorg/docker-scripts/develop-linux/develop?label=build%20develop-linux&style=flat-square)](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Adevelop-linux) +| [![GHA](https://img.shields.io/github/workflow/status/EpicMorg/docker-scripts/master-win32/master?label=build%20master-win32&style=flat-square)](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster-win32) | [![GHA](https://img.shields.io/github/workflow/status/EpicMorg/docker-scripts/develop-win32/develop?label=build%20develop-win32&style=flat-square)](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Adevelop-win32) ![](https://raw.githubusercontent.com/EpicMorg/docker-scripts/master/.github/logo.png) From 7b0901cf1a2b6ed8e3c3ef7e7308c3992eeca5e8 Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 13 Apr 2021 00:56:37 +0300 Subject: [PATCH 2/2] nextcloud update --- CHANGELOG.md | 3 ++- linux/nextcloud/14/Dockerfile | 31 ++++++++++++++++++++++++++++--- linux/nextcloud/15/Dockerfile | 31 ++++++++++++++++++++++++++++--- linux/nextcloud/16/Dockerfile | 31 ++++++++++++++++++++++++++++--- linux/nextcloud/17/Dockerfile | 31 ++++++++++++++++++++++++++++--- linux/nextcloud/18/Dockerfile | 31 ++++++++++++++++++++++++++++--- linux/nextcloud/19/Dockerfile | 31 ++++++++++++++++++++++++++++--- linux/nextcloud/20/Dockerfile | 31 ++++++++++++++++++++++++++++--- linux/nextcloud/21/Dockerfile | 31 ++++++++++++++++++++++++++++--- linux/nextcloud/latest/Dockerfile | 31 ++++++++++++++++++++++++++++--- 10 files changed, 254 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43c21b483..fdc1f75b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ ## Changelog ### 2021 * `april` + * updated `nextcloud` images * `[BREAKING CHANGES]` reorganized space - `linux` and `win32` folders - * `[BREAKING CHANGES]` images `balancer` and `websites` was renamed to `nginx` and `apache2`. + * `[BREAKING CHANGES]` images `balancer` and `websites` was renamed to `nginx` and `apache2`. * support of old repos will be unlin `jan/2022`. please usen new instead. * updated `atlassian` images * fixed scripts by `find . -name '*.sh' -type f | xargs chmod +x` by [sof](https://stackoverflow.com/questions/13377606/chmod-recursively). diff --git a/linux/nextcloud/14/Dockerfile b/linux/nextcloud/14/Dockerfile index a9f77d5b5..c28f1b3c0 100644 --- a/linux/nextcloud/14/Dockerfile +++ b/linux/nextcloud/14/Dockerfile @@ -16,11 +16,17 @@ RUN apt update -y && \ apt-transport-https \ curl \ ca-certificates \ + ghostscript \ nload \ htop \ mc \ nano \ sudo \ + imagemagick \ + imagemagick-common \ + sqlite3 \ + smbclient \ + libsmbclient \ wget ################################################################## @@ -28,9 +34,28 @@ RUN apt update -y && \ ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' -RUN apt update -y && apt install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev -RUN pecl install smbclient -RUN docker-php-ext-enable smbclient +RUN apt update -y && \ + apt install -y --allow-unauthenticated \ + libsmbclient-dev \ + libmagickwand-dev \ + libmagickcore-dev \ + libc-client-dev \ + libkrb5-dev \ + libsqlite3-dev \ + libssl-dev + +RUN pecl install inotify && \ + docker-php-ext-enable inotify + +RUN pecl install smbclient && \ + docker-php-ext-enable smbclient + +RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ + docker-php-ext-install imap && \ + docker-php-ext-enable imap + +RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \ + docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite ################################################################## # thank u, mac users. rolling back normal ZipStreammer diff --git a/linux/nextcloud/15/Dockerfile b/linux/nextcloud/15/Dockerfile index 6d9589ac8..3ccf2cadb 100644 --- a/linux/nextcloud/15/Dockerfile +++ b/linux/nextcloud/15/Dockerfile @@ -16,11 +16,17 @@ RUN apt update -y && \ apt-transport-https \ curl \ ca-certificates \ + ghostscript \ nload \ htop \ mc \ nano \ sudo \ + imagemagick \ + imagemagick-common \ + sqlite3 \ + smbclient \ + libsmbclient \ wget ################################################################## @@ -28,9 +34,28 @@ RUN apt update -y && \ ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' -RUN apt update -y && apt install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev -RUN pecl install smbclient -RUN docker-php-ext-enable smbclient +RUN apt update -y && \ + apt install -y --allow-unauthenticated \ + libsmbclient-dev \ + libmagickwand-dev \ + libmagickcore-dev \ + libc-client-dev \ + libkrb5-dev \ + libsqlite3-dev \ + libssl-dev + +RUN pecl install inotify && \ + docker-php-ext-enable inotify + +RUN pecl install smbclient && \ + docker-php-ext-enable smbclient + +RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ + docker-php-ext-install imap && \ + docker-php-ext-enable imap + +RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \ + docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite ################################################################## # thank u, mac users. rolling back normal ZipStreammer diff --git a/linux/nextcloud/16/Dockerfile b/linux/nextcloud/16/Dockerfile index d0da31cbc..56d778f3c 100644 --- a/linux/nextcloud/16/Dockerfile +++ b/linux/nextcloud/16/Dockerfile @@ -16,11 +16,17 @@ RUN apt update -y && \ apt-transport-https \ curl \ ca-certificates \ + ghostscript \ nload \ htop \ mc \ nano \ sudo \ + imagemagick \ + imagemagick-common \ + sqlite3 \ + smbclient \ + libsmbclient \ wget ################################################################## @@ -28,9 +34,28 @@ RUN apt update -y && \ ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' -RUN apt update -y && apt install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev -RUN pecl install smbclient -RUN docker-php-ext-enable smbclient +RUN apt update -y && \ + apt install -y --allow-unauthenticated \ + libsmbclient-dev \ + libmagickwand-dev \ + libmagickcore-dev \ + libc-client-dev \ + libkrb5-dev \ + libsqlite3-dev \ + libssl-dev + +RUN pecl install inotify && \ + docker-php-ext-enable inotify + +RUN pecl install smbclient && \ + docker-php-ext-enable smbclient + +RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ + docker-php-ext-install imap && \ + docker-php-ext-enable imap + +RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \ + docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite ################################################################## # thank u, mac users. rolling back normal ZipStreammer diff --git a/linux/nextcloud/17/Dockerfile b/linux/nextcloud/17/Dockerfile index 766a62f8e..d8615bb38 100644 --- a/linux/nextcloud/17/Dockerfile +++ b/linux/nextcloud/17/Dockerfile @@ -16,11 +16,17 @@ RUN apt update -y && \ apt-transport-https \ curl \ ca-certificates \ + ghostscript \ nload \ htop \ mc \ nano \ sudo \ + imagemagick \ + imagemagick-common \ + sqlite3 \ + smbclient \ + libsmbclient \ wget ################################################################## @@ -28,9 +34,28 @@ RUN apt update -y && \ ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' -RUN apt update -y && apt install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev -RUN pecl install smbclient -RUN docker-php-ext-enable smbclient +RUN apt update -y && \ + apt install -y --allow-unauthenticated \ + libsmbclient-dev \ + libmagickwand-dev \ + libmagickcore-dev \ + libc-client-dev \ + libkrb5-dev \ + libsqlite3-dev \ + libssl-dev + +RUN pecl install inotify && \ + docker-php-ext-enable inotify + +RUN pecl install smbclient && \ + docker-php-ext-enable smbclient + +RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ + docker-php-ext-install imap && \ + docker-php-ext-enable imap + +RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \ + docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite ################################################################## # thank u, mac users. rolling back normal ZipStreammer diff --git a/linux/nextcloud/18/Dockerfile b/linux/nextcloud/18/Dockerfile index d1806573f..99d9e87b2 100644 --- a/linux/nextcloud/18/Dockerfile +++ b/linux/nextcloud/18/Dockerfile @@ -16,11 +16,17 @@ RUN apt update -y && \ apt-transport-https \ curl \ ca-certificates \ + ghostscript \ nload \ htop \ mc \ nano \ sudo \ + imagemagick \ + imagemagick-common \ + sqlite3 \ + smbclient \ + libsmbclient \ wget ################################################################## @@ -28,9 +34,28 @@ RUN apt update -y && \ ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' -RUN apt update -y && apt install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev -RUN pecl install smbclient -RUN docker-php-ext-enable smbclient +RUN apt update -y && \ + apt install -y --allow-unauthenticated \ + libsmbclient-dev \ + libmagickwand-dev \ + libmagickcore-dev \ + libc-client-dev \ + libkrb5-dev \ + libsqlite3-dev \ + libssl-dev + +RUN pecl install inotify && \ + docker-php-ext-enable inotify + +RUN pecl install smbclient && \ + docker-php-ext-enable smbclient + +RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ + docker-php-ext-install imap && \ + docker-php-ext-enable imap + +RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \ + docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite ################################################################## # thank u, mac users. rolling back normal ZipStreammer diff --git a/linux/nextcloud/19/Dockerfile b/linux/nextcloud/19/Dockerfile index c8e4e4112..91f561a60 100644 --- a/linux/nextcloud/19/Dockerfile +++ b/linux/nextcloud/19/Dockerfile @@ -16,11 +16,17 @@ RUN apt update -y && \ apt-transport-https \ curl \ ca-certificates \ + ghostscript \ nload \ htop \ mc \ nano \ sudo \ + imagemagick \ + imagemagick-common \ + sqlite3 \ + smbclient \ + libsmbclient \ wget ################################################################## @@ -28,9 +34,28 @@ RUN apt update -y && \ ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' -RUN apt update -y && apt install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev -RUN pecl install smbclient -RUN docker-php-ext-enable smbclient +RUN apt update -y && \ + apt install -y --allow-unauthenticated \ + libsmbclient-dev \ + libmagickwand-dev \ + libmagickcore-dev \ + libc-client-dev \ + libkrb5-dev \ + libsqlite3-dev \ + libssl-dev + +RUN pecl install inotify && \ + docker-php-ext-enable inotify + +RUN pecl install smbclient && \ + docker-php-ext-enable smbclient + +RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ + docker-php-ext-install imap && \ + docker-php-ext-enable imap + +RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \ + docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite ################################################################## # thank u, mac users. rolling back normal ZipStreammer diff --git a/linux/nextcloud/20/Dockerfile b/linux/nextcloud/20/Dockerfile index d4cfce6eb..885ad87a5 100644 --- a/linux/nextcloud/20/Dockerfile +++ b/linux/nextcloud/20/Dockerfile @@ -16,11 +16,17 @@ RUN apt update -y && \ apt-transport-https \ curl \ ca-certificates \ + ghostscript \ nload \ htop \ mc \ nano \ sudo \ + imagemagick \ + imagemagick-common \ + sqlite3 \ + smbclient \ + libsmbclient \ wget ################################################################## @@ -28,9 +34,28 @@ RUN apt update -y && \ ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' -RUN apt update -y && apt install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev -RUN pecl install smbclient -RUN docker-php-ext-enable smbclient +RUN apt update -y && \ + apt install -y --allow-unauthenticated \ + libsmbclient-dev \ + libmagickwand-dev \ + libmagickcore-dev \ + libc-client-dev \ + libkrb5-dev \ + libsqlite3-dev \ + libssl-dev + +RUN pecl install inotify && \ + docker-php-ext-enable inotify + +RUN pecl install smbclient && \ + docker-php-ext-enable smbclient + +RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ + docker-php-ext-install imap && \ + docker-php-ext-enable imap + +RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \ + docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite ################################################################## # thank u, mac users. rolling back normal ZipStreammer diff --git a/linux/nextcloud/21/Dockerfile b/linux/nextcloud/21/Dockerfile index ab085c891..7179f8788 100644 --- a/linux/nextcloud/21/Dockerfile +++ b/linux/nextcloud/21/Dockerfile @@ -16,11 +16,17 @@ RUN apt update -y && \ apt-transport-https \ curl \ ca-certificates \ + ghostscript \ nload \ htop \ mc \ nano \ sudo \ + imagemagick \ + imagemagick-common \ + sqlite3 \ + smbclient \ + libsmbclient \ wget ################################################################## @@ -28,9 +34,28 @@ RUN apt update -y && \ ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' -RUN apt update -y && apt install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev -RUN pecl install smbclient -RUN docker-php-ext-enable smbclient +RUN apt update -y && \ + apt install -y --allow-unauthenticated \ + libsmbclient-dev \ + libmagickwand-dev \ + libmagickcore-dev \ + libc-client-dev \ + libkrb5-dev \ + libsqlite3-dev \ + libssl-dev + +RUN pecl install inotify && \ + docker-php-ext-enable inotify + +RUN pecl install smbclient && \ + docker-php-ext-enable smbclient + +RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ + docker-php-ext-install imap && \ + docker-php-ext-enable imap + +RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \ + docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite ################################################################## # thank u, mac users. rolling back normal ZipStreammer diff --git a/linux/nextcloud/latest/Dockerfile b/linux/nextcloud/latest/Dockerfile index 895898e51..6961dd270 100644 --- a/linux/nextcloud/latest/Dockerfile +++ b/linux/nextcloud/latest/Dockerfile @@ -16,11 +16,17 @@ RUN apt update -y && \ apt-transport-https \ curl \ ca-certificates \ + ghostscript \ nload \ htop \ mc \ nano \ sudo \ + imagemagick \ + imagemagick-common \ + sqlite3 \ + smbclient \ + libsmbclient \ wget ################################################################## @@ -28,9 +34,28 @@ RUN apt update -y && \ ################################################################## RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' -RUN apt update -y && apt install -y --allow-unauthenticated smbclient libsmbclient libsmbclient-dev -RUN pecl install smbclient -RUN docker-php-ext-enable smbclient +RUN apt update -y && \ + apt install -y --allow-unauthenticated \ + libsmbclient-dev \ + libmagickwand-dev \ + libmagickcore-dev \ + libc-client-dev \ + libkrb5-dev \ + libsqlite3-dev \ + libssl-dev + +RUN pecl install inotify && \ + docker-php-ext-enable inotify + +RUN pecl install smbclient && \ + docker-php-ext-enable smbclient + +RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ + docker-php-ext-install imap && \ + docker-php-ext-enable imap + +RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \ + docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite ################################################################## # thank u, mac users. rolling back normal ZipStreammer