EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2025-02-04 01:30:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50 from EpicMorg/develop

Browse Source 
jul-patch
This commit is contained in:
STAM 2020-07-18 04:39:10 +03:00 committed by GitHub
commit 05ff38fa89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 330 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -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

13
CHANGELOG.md
View File

@ -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)

2
atlassian/bitbucket/latest/Dockerfile
View File

@ -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
##################################################################

2
atlassian/bitbucket/latest/Dockerfile.jdk11
View File

@ -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
##################################################################

2
atlassian/confluence/latest/Dockerfile
View File

@ -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
##################################################################

2
atlassian/confluence/latest/Dockerfile.jdk11
View File

@ -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
##################################################################

2
atlassian/jira/latest/Dockerfile
View File

@ -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
##################################################################

2
atlassian/jira/latest/Dockerfile.jdk11
View File

@ -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
##################################################################

2
balancer/latest/Dockerfile
View File

@ -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

3
epicmorg/devel/main/Dockerfile
View File

@ -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

3
epicmorg/edge/main/Dockerfile
View File

@ -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

3
epicmorg/prod/main/Dockerfile
View File

@ -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

28
nextcloud/latest/Dockerfile
View File

@ -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

BIN
nextcloud/latest/php-smbclient-latest.tar.gz
View File

Binary file not shown.

19
nextcloud/latest/sources.list Normal file
View File

@ -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

2
qbittorrent/latest/Dockerfile
View File

@ -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

4
qbittorrent/latest/qbittorrent-unstable.list
View File

@ -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

2
qbittorrent/stable/Dockerfile
View File

@ -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

4
qbittorrent/stable/qbittorrent-stable.list
View File

@ -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

80
teamcity-agent/Dockerfile
View File

@ -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

171
websites/php7.3/Dockerfile Normal file
View File

@ -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"]

4
websites/php7.3/Makefile Normal file
View File

@ -0,0 +1,4 @@
all: php
php:
docker build --compress -t epicmorg/websites:php7.3 .
docker push epicmorg/websites:php7.2

32
websites/php7.3/README.md Normal file
View File

@ -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
```

5
websites/php7.3/run.sh Executable file
View File

@ -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