diff --git a/epicmorg/devel/main/Dockerfile b/epicmorg/devel/main/Dockerfile index 25aec8ad3..a0717cc9e 100644 --- a/epicmorg/devel/main/Dockerfile +++ b/epicmorg/devel/main/Dockerfile @@ -89,7 +89,8 @@ RUN apt-get update && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ +RUN apt purge policykit-1 -y && \ + apt clean -y && \ apt autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/edge/main/Dockerfile b/epicmorg/edge/main/Dockerfile index a7d90902c..335d412a7 100644 --- a/epicmorg/edge/main/Dockerfile +++ b/epicmorg/edge/main/Dockerfile @@ -15,7 +15,8 @@ RUN apt update && \ ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ +RUN apt purge policykit-1 -y && \ + apt clean -y && \ apt autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/epicmorg/prod/main/Dockerfile b/epicmorg/prod/main/Dockerfile index a52d88f9a..849dfd949 100644 --- a/epicmorg/prod/main/Dockerfile +++ b/epicmorg/prod/main/Dockerfile @@ -82,7 +82,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio ################################################################## # cleaninig up ################################################################## -RUN apt clean -y && \ +RUN apt purge policykit-1 -y && \ + apt clean -y && \ apt autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/cache/apt/archives/*.deb diff --git a/nextcloud/latest/Dockerfile b/nextcloud/latest/Dockerfile index ef3983c2c..a1904a160 100644 --- a/nextcloud/latest/Dockerfile +++ b/nextcloud/latest/Dockerfile @@ -1,14 +1,30 @@ FROM nextcloud:latest ENV DEBIAN_FRONTEND noninteractive -#smb additional magic -ADD php-smbclient-latest.tar.gz /tmp -RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \ - cp -fv /tmp/php-smbclient-latest/usr/lib/php/20180731/smbclient.so /usr/local/lib/php/extensions/no-debug-non-zts-20180731/smbclient.so && \ - rm -frv /tmp/php-smbclient-latest.tar.gz /tmp/php-smbclient-latest +#adding normal sources list +RUN rm /etc/apt/sources.list +COPY sources.list /etc/apt/sources.list #addoing some utils -RUN apt update -y && apt install -y --allow-unauthenticated sudo apt-transport-https wget htop mc nano smbclient libsmbclient +RUN apt update -y && \ + apt dist-upgrade -y && \ + apt install -y --allow-unauthenticated \ + apt-transport-https \ + curl \ + ca-certificates \ + nload \ + htop \ + mc \ + nano \ + sudo \ + wget + +#installing php repo + smbclient +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 #thank u, mac users. rolling back normal ZipStreammer RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php diff --git a/nextcloud/latest/php-smbclient-latest.tar.gz b/nextcloud/latest/php-smbclient-latest.tar.gz deleted file mode 100644 index 050212013..000000000 Binary files a/nextcloud/latest/php-smbclient-latest.tar.gz and /dev/null differ diff --git a/nextcloud/latest/sources.list b/nextcloud/latest/sources.list new file mode 100644 index 000000000..fd3092816 --- /dev/null +++ b/nextcloud/latest/sources.list @@ -0,0 +1,19 @@ +#main +deb http://ftp.ru.debian.org/debian/ buster main contrib non-free +deb-src http://ftp.ru.debian.org/debian/ buster main contrib non-free +deb http://ftp.ru.debian.org/debian/ buster-updates main contrib non-free +deb-src http://ftp.ru.debian.org/debian/ buster-updates main contrib non-free +deb http://ftp.ru.debian.org/debian/ buster-backports main contrib non-free +deb-src http://ftp.ru.debian.org/debian/ buster-backports main contrib non-free +deb http://ftp.ru.debian.org/debian/ buster-proposed-updates main contrib non-free +deb-src http://ftp.ru.debian.org/debian/ buster-proposed-updates main contrib non-free + +#security +deb http://ftp.ru.debian.org/debian-security/ buster/updates main contrib non-free +deb-src http://ftp.ru.debian.org/debian-security/ buster/updates main contrib non-free + +##multimedia +#deb http://ftp.ru.debian.org/debian-multimedia/ buster main non-free +#deb-src http://ftp.ru.debian.org/debian-multimedia/ buster main non-free +#deb http://ftp.ru.debian.org/debian-multimedia/ buster-backports main +#deb-src http://ftp.ru.debian.org/debian-multimedia/ buster-backports main diff --git a/qbittorrent/latest/Dockerfile b/qbittorrent/latest/Dockerfile index 9d1f08757..611555133 100644 --- a/qbittorrent/latest/Dockerfile +++ b/qbittorrent/latest/Dockerfile @@ -17,7 +17,7 @@ RUN mkdir -p ${QBT_DIR} ################################################################## RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com D35164147CA69FC4 COPY qbittorrent-unstable.list /etc/apt/sources.list.d/qbittorrent-unstable.list -RUN apt autoremove -y && apt update && apt dist-upgrade -y +RUN apt autoremove -y && apt purge policykit-1 -y && apt update && apt dist-upgrade -y ############################# #################################### # qbittorrent install diff --git a/qbittorrent/latest/qbittorrent-unstable.list b/qbittorrent/latest/qbittorrent-unstable.list index 227e24a11..f6ecdaf6d 100644 --- a/qbittorrent/latest/qbittorrent-unstable.list +++ b/qbittorrent/latest/qbittorrent-unstable.list @@ -1,2 +1,2 @@ -deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu eoan main -deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu eoan main +deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main +deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-unstable/ubuntu focal main diff --git a/qbittorrent/stable/Dockerfile b/qbittorrent/stable/Dockerfile index a6007cf0b..8ed5af42c 100644 --- a/qbittorrent/stable/Dockerfile +++ b/qbittorrent/stable/Dockerfile @@ -17,7 +17,7 @@ RUN mkdir -p ${QBT_DIR} ################################################################## RUN apt-key adv --recv-keys --keyserver keyserver.ubuntu.com D35164147CA69FC4 COPY qbittorrent-stable.list /etc/apt/sources.list.d/qbittorrent-stable.list -RUN apt autoremove -y && apt update && apt dist-upgrade -y +RUN apt autoremove -y && apt purge policykit-1 -y && apt update && apt dist-upgrade -y ############################# #################################### # qbittorrent install diff --git a/qbittorrent/stable/qbittorrent-stable.list b/qbittorrent/stable/qbittorrent-stable.list index be86cd304..f3d38943c 100644 --- a/qbittorrent/stable/qbittorrent-stable.list +++ b/qbittorrent/stable/qbittorrent-stable.list @@ -1,2 +1,2 @@ -deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu eoan main -deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu eoan main +deb http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main +deb-src http://ppa.launchpad.net/qbittorrent-team/qbittorrent-stable/ubuntu focal main diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile index 5014c51c2..1f4744b42 100644 --- a/teamcity-agent/Dockerfile +++ b/teamcity-agent/Dockerfile @@ -165,50 +165,53 @@ RUN curl -SL https://packages.atlassian.com/atlassian-sdk-deb/debian/pool/contri 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' +#installing apache2 repo +RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg +RUN sh -c 'echo "deb https://packages.sury.org/apache2/ buster main" > /etc/apt/sources.list.d/apache2.list' + #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ - php7.3-gmp \ - php7.3-snmp \ - php7.3-ldap \ - php7.3-dev \ - php7.3 \ - php7.3-mail \ + php7.4 \ + php7.4-dev \ + php7.4-fpm \ + php7.4-cli \ + php7.4-cgi \ + php-pear \ + php-gmp \ + php-snmp \ + php-ldap \ + php-mail \ # php-mailparse \ - php7.3-soap \ - php7.3-mysql \ - php7.3-memcached \ + php-soap \ + php-mysql \ + php-memcached \ php-memcache \ php-igbinary \ - php7.3-curl \ - php7.3-gd \ - php7.3-intl \ - php7.3-zip \ - php7.3-bcmath \ - php7.3-fpm \ - php-pear \ - php7.3-imap \ - php7.3-pspell \ - php7.3-recode \ - php7.3-sqlite3 \ - php7.3-tidy \ - php7.3-xmlrpc \ - php7.3-xml \ - php7.3-mbstring \ - php7.3-gettext \ + php-curl \ + php-gd \ + php-intl \ + php-zip \ + php-bcmath \ + php-imap \ + php-pspell \ + php-sqlite3 \ + php-tidy \ + php-xmlrpc \ + php-xml \ + php-mbstring \ +# php-gettext \ php-apcu \ - php7.3-cli \ - php7.3-common \ - php7.3-cgi \ - php7.3-json \ - php7.3-readline \ - php7.3-enchant \ + php-common \ + php-json \ + php-readline \ + php-enchant \ php-ssh2 \ php-oauth \ php-gmagick \ php-gnupg \ php-redis \ - php7.3-smbclient \ + php-smbclient \ php-yaml \ php-geoip \ sendmail && \ @@ -223,7 +226,7 @@ RUN apt-get update && \ fileinfo \ gd \ geoip \ - gettext \ +# gettext \ gnupg \ iconv \ imap \ @@ -259,9 +262,8 @@ RUN apt-get update && \ RUN cd /tmp && \ php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \ php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \ - rm /tmp/composer-setup.php - - + rm /tmp/composer-setup.php && \ + composer global require elendev/nexus-composer-push ##################################################################