EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2024-10-17 07:46:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51 from EpicMorg/develop

Browse Source 
Develop
This commit is contained in:
STAM 2020-09-04 19:38:15 +03:00 committed by GitHub
commit 876a8514d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 174 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
.travis.yml
View File

@ -116,6 +116,38 @@ matrix:
- docker build --compress -t epicmorg/edge:jdk11 epicmorg/edge/jdk11
- docker push epicmorg/edge:jdk11
##########
- name: Base Edge Bullseye
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/edge:bullseye epicmorg/edge-bullseye/main
- docker push epicmorg/edge:bullseye
- name: Base Edge Bullseye + JDK 6
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/edge:jdk6 epicmorg/edge-bullseye/jdk6
- docker push epicmorg/edge:bullseye-jdk6
- name: Base Edge Bullseye + JDK 7
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/edge:jdk7 epicmorg/edge-bullseye/jdk7
- docker push epicmorg/edge:bullseye-jdk7
- name: Base Edge Bullseye + JDK 8
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/edge:jdk8 epicmorg/edge-bullseye/jdk8
- docker push epicmorg/edge:bullseye-jdk8
- name: Base Edge Bullseye + JDK 11
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/edge:jdk11 epicmorg/edge-bullseye/jdk11
- docker push epicmorg/edge:bullseye-jdk11
##########
- name: Base Develop
@ -148,6 +180,39 @@ matrix:
- docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11
- docker push epicmorg/devel:jdk11
##########
- name: Base Develop Bullseye
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/devel:bullseye epicmorg/devel-bullseye/main
- docker push epicmorg/devel:bullseye
- name: Base Develop + JDK 6
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/devel:jdk6 epicmorg/devel-bullseye/jdk6
- docker push epicmorg/devel:bullseye-jdk6
- name: Base Develop + JDK 7
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/devel:jdk7 epicmorg/devel-bullseye/jdk7
- docker push epicmorg/devel:bullseye-jdk7
- name: Base Develop + JDK 8
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/devel:jdk8 epicmorg/devel-bullseye/jdk8
- docker push epicmorg/devel:bullseye-jdk8
- name: Base Develop + JDK 11
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11
- docker push epicmorg/devel:bullseye-jdk11
##########
- name: TeamCity Agent
@ -184,7 +249,7 @@ matrix:
- name: Apache + PHP7.4
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/websites:latest websites/php7.4
- docker build --compress -t epicmorg/websites:php7.4 websites/php7.4
- docker push epicmorg/websites:php7.4
- name: Apache + PHP7.3
@ -202,7 +267,7 @@ matrix:
- name: Testrail (always latest)
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/testrail:latest tesrtail
- docker build --compress -t epicmorg/testrail:latest testrail
- docker push epicmorg/testrail:latest
- name: PostgresSQL (latest)

3
CHANGELOG.md
View File

@ -1,4 +1,7 @@
## Changelog
* `September`
* fixes
* updated `base images`, `apache2`, `testrail`, `TeamCity Agnet`, `nginx`, `bitbucket`, `jira`, `confluence`
* `August`
* added `testrail` based on `websites:php7.2` image. always `latest` version
* added `balancer:rtmp-hls` image, based on `balancer:latest` and [TareqAlqutami/rtmp-hls-server](https://github.com/TareqAlqutami/rtmp-hls-server) configs. `TareqAlqutami`, thank you for it.

2
atlassian/bitbucket/latest/Dockerfile
View File

@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
##################################################################
# ARGuments
##################################################################
ARG BITBUCKET_VERSION=7.4.0
ARG BITBUCKET_VERSION=7.5.1
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.4.0
ARG BITBUCKET_VERSION=7.5.1
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.6.1
ARG CONFLUENCE_VERSION=7.7.3
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.6.1
ARG CONFLUENCE_VERSION=7.7.3
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.11.0
ARG JIRA_VERSION=8.12.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.11.0
ARG JIRA_VERSION=8.12.0
ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz
##################################################################

8
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.19.1
ARG NGINX_VERSION=1.19.2
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
@ -24,7 +24,6 @@ ADD pre/luajit2-description-pak ${PRE_DIR}
ADD pre/nginx-description-pak ${PRE_DIR}
ADD pre/ip2location-description-pak ${PRE_DIR}
##################################################################
# IP2Location support for prod nginx module
##################################################################
@ -176,6 +175,11 @@ FROM epicmorg/edge
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive
##################################################################
# LDAP Fix
##################################################################
RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
##################################################################
# Installing nginx from deb
##################################################################

3
epicmorg/edge/main/Dockerfile
View File

@ -5,8 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
##################################################################
# sid sources list
##################################################################
RUN rm /etc/apt/sources.list
COPY sources.list /etc/apt/sources.list
COPY sources.sid.list /etc/apt/sources.list.d/sources.sid.list
RUN apt update && \
apt autoremove -y && \
apt dist-upgrade -y && \

19
epicmorg/edge/main/sources.list
View File

@ -1,19 +0,0 @@
#main
deb http://ftp.ru.debian.org/debian/ sid main contrib non-free
deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free
deb http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free
deb-src http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free
deb http://ftp.ru.debian.org/debian/ testing-proposed-updates main contrib non-free
deb-src http://ftp.ru.debian.org/debian/ testing-proposed-updates main contrib non-free
#backports
#deb http://ftp.ru.debian.org/debian/ testing-backports main contrib non-free
#deb-src http://ftp.ru.debian.org/debian/ testing-backports main contrib non-free
#security
deb http://ftp.ru.debian.org/debian-security/ testing-security main contrib non-free
deb-src http://ftp.ru.debian.org/debian-security/ testing-security main contrib non-free
##multimedia
#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free
#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free

7
epicmorg/edge/main/sources.sid.list Normal file
View File

@ -0,0 +1,7 @@
#main
deb http://ftp.ru.debian.org/debian/ sid main contrib non-free
deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free
##multimedia
#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free
#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free

21
teamcity-agent/Dockerfile
View File

@ -2,6 +2,17 @@ FROM epicmorg/devel:jdk11
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive
##################################################################
# bullseye sources list
##################################################################
#COPY sources.bullseye.list /etc/apt/sources.list.d/sources.bullseye.list
RUN apt update && \
apt autoremove -y && \
apt dist-upgrade -y && \
apt autoremove -y
##################################################################
# teamcity minimal agent
##################################################################
@ -183,6 +194,7 @@ RUN apt-get update && \
php-ldap \
php-mail \
# php-mailparse \
php-interbase \
php-soap \
php-mysql \
php-memcached \
@ -217,6 +229,7 @@ RUN apt-get update && \
sendmail && \
phpenmod \
snmp \
interbase \
gmp \
calendar \
ldap \
@ -266,12 +279,14 @@ RUN cd /tmp && \
composer global require elendev/nexus-composer-push && \
composer
##################################################################
# Node.js 12.x
# Node.js 14.x
##################################################################
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list && \
echo "deb https://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list && \
apt-get update && \
apt-get install -y nodejs yarn

7
websites/latest/Dockerfile
View File

@ -39,6 +39,7 @@ RUN apt-get update && \
php-memcached \
php-memcache \
php-igbinary \
php-interbase \
php-curl \
php-gd \
php-intl \
@ -80,6 +81,7 @@ RUN apt-get update && \
# gettext \
gnupg \
iconv \
interbase \
imap \
json \
mbstring \
@ -126,6 +128,11 @@ RUN apt-get update && \
ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \
php -v
##################################################################
# LDAP Fix
##################################################################
RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
##################################################################
# Installing IOnCube addon
##################################################################

5
websites/php7.2/Dockerfile
View File

@ -83,6 +83,11 @@ RUN apt-get update && \
ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \
php -v
##################################################################
# LDAP Fix
##################################################################
RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
##################################################################
# Installing IOnCube addon
##################################################################

6
websites/php7.3/Dockerfile
View File

@ -127,6 +127,12 @@ RUN apt-get update && \
ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \
php -v
##################################################################
# LDAP Fix
##################################################################
RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
##################################################################
# Installing IOnCube addon
##################################################################

7
websites/php7.4/Dockerfile
View File

@ -39,6 +39,7 @@ RUN apt-get update && \
php-memcached \
php-memcache \
php-igbinary \
php-interbase \
php-curl \
php-gd \
php-intl \
@ -81,6 +82,7 @@ RUN apt-get update && \
gnupg \
iconv \
imap \
interbase \
json \
mbstring \
memcached \
@ -126,6 +128,11 @@ RUN apt-get update && \
ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \
php -v
##################################################################
# LDAP Fix
##################################################################
RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
##################################################################
# Installing IOnCube addon
##################################################################

22
zabbix/agent/sources.list
View File

@ -2,18 +2,16 @@
# OFFICIAL UBUNTU REPOS #
#------------------------------------------------------------------------------#
###### Ubuntu Main Repos
deb http://mirror.yandex.ru/ubuntu/ bionic main restricted universe multiverse
deb-src http://mirror.yandex.ru/ubuntu/ bionic main restricted universe multiverse
deb http://mirror.yandex.ru/ubuntu/ focal main restricted universe multiverse
deb-src http://mirror.yandex.ru/ubuntu/ focal main restricted universe multiverse
###### Ubuntu Update Repos
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-proposed main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-proposed main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse

22
zabbix/java-gateway/sources.list
View File

@ -2,18 +2,16 @@
# OFFICIAL UBUNTU REPOS #
#------------------------------------------------------------------------------#
###### Ubuntu Main Repos
deb http://mirror.yandex.ru/ubuntu/ bionic main restricted universe multiverse
deb-src http://mirror.yandex.ru/ubuntu/ bionic main restricted universe multiverse
deb http://mirror.yandex.ru/ubuntu/ focal main restricted universe multiverse
deb-src http://mirror.yandex.ru/ubuntu/ focal main restricted universe multiverse
###### Ubuntu Update Repos
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-proposed main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-proposed main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse

22
zabbix/server/sources.list
View File

@ -2,18 +2,16 @@
# OFFICIAL UBUNTU REPOS #
#------------------------------------------------------------------------------#
###### Ubuntu Main Repos
deb http://mirror.yandex.ru/ubuntu/ bionic main restricted universe multiverse
deb-src http://mirror.yandex.ru/ubuntu/ bionic main restricted universe multiverse
deb http://mirror.yandex.ru/ubuntu/ focal main restricted universe multiverse
deb-src http://mirror.yandex.ru/ubuntu/ focal main restricted universe multiverse
###### Ubuntu Update Repos
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-proposed main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-proposed main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse

22
zabbix/web/sources.list
View File

@ -2,18 +2,16 @@
# OFFICIAL UBUNTU REPOS #
#------------------------------------------------------------------------------#
###### Ubuntu Main Repos
deb http://mirror.yandex.ru/ubuntu/ bionic main restricted universe multiverse
deb-src http://mirror.yandex.ru/ubuntu/ bionic main restricted universe multiverse
deb http://mirror.yandex.ru/ubuntu/ focal main restricted universe multiverse
deb-src http://mirror.yandex.ru/ubuntu/ focal main restricted universe multiverse
###### Ubuntu Update Repos
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-proposed main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-proposed main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ bionic-backports main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
deb http://ru.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-proposed main restricted universe multiverse
deb-src http://ru.archive.ubuntu.com/ubuntu/ focal-backports main restricted universe multiverse