diff --git a/.travis.yml b/.travis.yml index e90846bad..86adc3731 100644 --- a/.travis.yml +++ b/.travis.yml @@ -175,6 +175,12 @@ matrix: - docker build --compress -t epicmorg/websites:latest websites/latest - docker push epicmorg/websites:latest + - name: Apache + PHP7.3 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/websites:php7.3 websites/php7.3 + - docker push epicmorg/websites:php7.3 + - name: Apache + PHP7.2 script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin diff --git a/CHANGELOG.md b/CHANGELOG.md index ffc6dd8d2..adedd99a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,17 @@ ## Changelog -* `March-April 2020` +* `May-july 2020` + * Upgraded `TeamCity Agnet` + * upgraded `nginx` + * Fixed `Nextcloud` + * Fixed `qBittorrent` + * Added `websites:php7.3` + * Updated `atlassian` versions + * Added `testrail` (beta release) + * Fixed bugs +* `March-Apr 2020` * Added new atlassian versions * Fixed bugs - * Upgraded nginx + * Upgraded nginx * `February 2020` * **Big rework of repositories on github**. Containers was Splited to another sub-repositories. Now current repo will be contain only fresh and latest versions of images. All older versions will be appeared in sub-repos. More fater building, less bad load to CI. * `fixed` all `*.sh` chmods. (sorry) diff --git a/atlassian/bitbucket/latest/Dockerfile b/atlassian/bitbucket/latest/Dockerfile index ab109cf5b..48c577806 100644 --- a/atlassian/bitbucket/latest/Dockerfile +++ b/atlassian/bitbucket/latest/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG BITBUCKET_VERSION=7.2.3 +ARG BITBUCKET_VERSION=7.4.0 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz ################################################################## diff --git a/atlassian/bitbucket/latest/Dockerfile.jdk11 b/atlassian/bitbucket/latest/Dockerfile.jdk11 index 6a249b672..d987266f2 100644 --- a/atlassian/bitbucket/latest/Dockerfile.jdk11 +++ b/atlassian/bitbucket/latest/Dockerfile.jdk11 @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG BITBUCKET_VERSION=7.2.3 +ARG BITBUCKET_VERSION=7.4.0 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz ################################################################## diff --git a/atlassian/confluence/latest/Dockerfile b/atlassian/confluence/latest/Dockerfile index b68d4a706..5f5de377f 100644 --- a/atlassian/confluence/latest/Dockerfile +++ b/atlassian/confluence/latest/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.5.0 +ARG CONFLUENCE_VERSION=7.6.1 ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/atlassian/confluence/latest/Dockerfile.jdk11 b/atlassian/confluence/latest/Dockerfile.jdk11 index c1ae4667a..94913ed52 100644 --- a/atlassian/confluence/latest/Dockerfile.jdk11 +++ b/atlassian/confluence/latest/Dockerfile.jdk11 @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.5.0 +ARG CONFLUENCE_VERSION=7.6.1 ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/atlassian/jira/latest/Dockerfile b/atlassian/jira/latest/Dockerfile index c147ed0bd..ec0717a0a 100644 --- a/atlassian/jira/latest/Dockerfile +++ b/atlassian/jira/latest/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG JIRA_VERSION=8.9.0 +ARG JIRA_VERSION=8.11.0 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz ################################################################## diff --git a/atlassian/jira/latest/Dockerfile.jdk11 b/atlassian/jira/latest/Dockerfile.jdk11 index 1101a0ab7..9687567d2 100644 --- a/atlassian/jira/latest/Dockerfile.jdk11 +++ b/atlassian/jira/latest/Dockerfile.jdk11 @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG JIRA_VERSION=8.9.0 +ARG JIRA_VERSION=8.11.0 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz ################################################################## diff --git a/balancer/latest/Dockerfile b/balancer/latest/Dockerfile index ff9701e2d..a76fa50bd 100644 --- a/balancer/latest/Dockerfile +++ b/balancer/latest/Dockerfile @@ -11,7 +11,7 @@ ARG SRC_DIR=${BUILDS_DIR}/src ARG EXPORT_DIR=${BUILDS_DIR}/export ARG PRE_DIR=${BUILDS_DIR}/pre ARG NGINX_SRC_DIR=${SRC_DIR}/nginx -ARG NGINX_VERSION=1.18.0 +ARG NGINX_VERSION=1.19.1 ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz ARG LUAJIT_INC=/usr/local/include/luajit-2.1 ARG LUAJIT_LIB=/usr/local/lib 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..0128adea9 100644 --- a/teamcity-agent/Dockerfile +++ b/teamcity-agent/Dockerfile @@ -159,56 +159,59 @@ RUN curl -SL https://packages.atlassian.com/atlassian-sdk-deb/debian/pool/contri # atlassian-plugin-sdk ################################################################## -# Installing PHP7 +# Installing PHP7.4 ################################################################## #installing php repo 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 \ @@ -251,7 +254,7 @@ RUN apt-get update && \ xsl \ yaml && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ - php -v + php -v ################################################################## # Installing Composer addon @@ -259,10 +262,9 @@ 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 && \ + composer ################################################################## # Node.js 12.x diff --git a/websites/php7.3/Dockerfile b/websites/php7.3/Dockerfile new file mode 100644 index 000000000..6d0dee622 --- /dev/null +++ b/websites/php7.3/Dockerfile @@ -0,0 +1,171 @@ +FROM epicmorg/edge +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# Installing Apache2 + PHP7 +################################################################## +#installing php repo +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 \ + apache2 \ + apache2-utils \ + libapache2-mod-php7.3 \ + libapache2-mod-webauth \ + libapache2-mod-xforward \ + libapache2-mod-security2 \ + libmemcached-dev \ + php7.3-gmp \ + php7.3-snmp \ + php7.3-ldap \ + php7.3-dev \ + php7.3 \ + php7.3-mail \ + php7.3-mailparse \ + php7.3-soap \ + php7.3-mysql \ + php7.3-memcached \ +# php7.3-memcache \ +# php7.3-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-apcu \ + php7.3-cli \ + php7.3-common \ + php7.3-cgi \ + php7.3-json \ + php7.3-readline \ + php7.3-enchant \ + php-ssh2 \ + php-oauth \ + php-gmagick \ + php-gnupg \ + php7.3-redis \ + php7.3-smbclient \ + php7.3-yaml \ + php-geoip \ + sendmail && \ + phpenmod \ + snmp \ + gmp \ + calendar \ + ldap \ + curl \ + exif \ + ftp \ + fileinfo \ + gd \ + geoip \ + gettext \ + gnupg \ + iconv \ + imap \ + json \ + mbstring \ + memcached \ + mysqli \ + mysqlnd \ + oauth \ + pdo_mysql \ + pdo_sqlite \ + phar \ + posix \ + readline \ + redis \ + simplexml \ + sockets \ + sqlite3 \ + ssh2 \ + tokenizer \ + xml \ + xmlreader \ + xmlrpc \ + xmlwriter \ + xsl \ + yaml && \ + a2enmod \ + php7.3 \ + rewrite \ + ldap \ + heartmonitor \ + auth_basic \ + authnz_ldap \ + headers \ + heartbeat \ + lua \ + mime \ + status \ + xml2enc \ + xforward \ + remoteip \ + filter \ + dav \ + dav_fs \ + alias && \ + ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \ + php -v + +################################################################## +# Installing IOnCube addon +################################################################## +ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz +RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \ + cp /tmp/ioncube/ioncube_loader_lin_7.3.so /usr/lib/php/20170718/ && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/apache2/php.ini && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/cgi/php.ini && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/cli/php.ini && \ + echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.3.so" >> /etc/php/7.3/fpm/php.ini && \ + php -v + +################################################################## +# Installing Composer addon +################################################################## +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 + +################################################################## +# cleaninig up +################################################################## +RUN apt clean -y && \ + apt autoclean -y && \ + rm -rfv /var/lib/apt/lists/* && \ + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/deb/* && \ + rm -rfv /tmp/composer-setup.php && \ + rm -rfv /tmp/ioncube.tar.gz + +#volumes +VOLUME ["/var/www"] + +# Add image configuration and scripts +COPY run.sh /run.sh +RUN chmod 755 /*.sh + +# Configure application +EXPOSE 80 +WORKDIR /var/www/ +CMD ["/run.sh"] diff --git a/websites/php7.3/Makefile b/websites/php7.3/Makefile new file mode 100644 index 000000000..38efee62d --- /dev/null +++ b/websites/php7.3/Makefile @@ -0,0 +1,4 @@ +all: php +php: + docker build --compress -t epicmorg/websites:php7.3 . + docker push epicmorg/websites:php7.2 diff --git a/websites/php7.3/README.md b/websites/php7.3/README.md new file mode 100644 index 000000000..86a34d4b1 --- /dev/null +++ b/websites/php7.3/README.md @@ -0,0 +1,32 @@ +# Compose example + +```yml +version: '3.7' +services: + websites: + image: epicmorg/websites +# depends_on: +# - mysql +# - memcached + restart: unless-stopped + volumes: + - /etc/localtime:/etc/localtime + - /etc/timezone:/etc/timezone +# - /etc/letsencrypt:/etc/letsencrypt + - www:/var/www + - apache2:/etc/apache2 + - php:/etc/php + restart: unless-stopped +# extra_hosts: +# - "example.com:192.168.0.11" + tmpfs: + - /tmp + - /var/lib/php/sessions +volumes: + www: + external: true + apache2: + external: true + php: + external: true +``` diff --git a/websites/php7.3/run.sh b/websites/php7.3/run.sh new file mode 100755 index 000000000..e67d69a29 --- /dev/null +++ b/websites/php7.3/run.sh @@ -0,0 +1,5 @@ +#!/bin/bash +chown www-data:www-data /var/www -R +source /etc/apache2/envvars +tail -F /var/log/apache2/* & +exec apache2 -D FOREGROUND