Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stamepicmorg committed Jul 30, 2020
2 parents 05ff38f + aaa7ef7 commit f03ed1d
Show file tree
Hide file tree
Showing 14 changed files with 282 additions and 2,063 deletions.
14 changes: 12 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,18 @@ matrix:
- docker push epicmorg/balancer:php


- name: Apache + PHP7.4
- name: Apache (latest)
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/websites:latest websites/latest
- docker push epicmorg/websites:latest

- 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 push epicmorg/websites:php7.4

- name: Apache + PHP7.3
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
Expand All @@ -187,7 +193,11 @@ matrix:
- docker build --compress -t epicmorg/websites:php7.2 websites/php7.2
- docker push epicmorg/websites:php7.2

##########
- name: Testrail (always latest)
script:
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- docker build --compress -t epicmorg/testrail:latest tesrtail
- docker push epicmorg/testrail:latest

- name: PostgresSQL (latest)
script:
Expand Down
41 changes: 41 additions & 0 deletions testrail/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
FROM epicmorg/websites:php7.2

ARG TESTRAIL_VERSION=latest
ARG DOWNLOAD_URL=https://secure.gurock.com/downloads/testrail/testrail-${TESTRAIL_VERSION}-ion71.zip
ARG TESTRAIL_RELEASE_DIR=testrail-release

ENV TR_DEFAULT_TASK_EXECUTION=60
ENV TR_CONFIGPATH="/var/www/testrail/config/"
ENV TR_DEFAULT_LOG_DIR="/opt/testrail/logs/"
ENV TR_DEFAULT_AUDIT_DIR="/opt/testrail/audit/"
ENV TR_DEFAULT_REPORT_DIR="/opt/testrail/reports/"
ENV TR_DEFAULT_ATTACHMENT_DIR="/opt/testrail/attachments/"
ENV OPENSSL_CONF=/etc/ssl/

RUN \
apt-get update && \
apt-get install -y --no-install-recommends curl zip unzip wget iputils-ping mariadb-client openssl && \
apt-get install -y --no-install-recommends zlib1g-dev libcurl4-gnutls-dev libldap2-dev zlib1g-dev libxml2-dev libfontconfig1 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* && \
rm -rf /run.sh


RUN \
echo "WGET" && \
mkdir -p /${TESTRAIL_RELEASE_DIR} && \
mkdir -p /var/www/testrail && \
mkdir -p /opt/testrail/attachments /opt/testrail/reports /opt/testrail/logs /opt/testrail/audit && \
wget --no-check-certificate -O /${TESTRAIL_RELEASE_DIR}/testrail.zip ${DOWNLOAD_URL} && \
chown -R www-data:www-data /${TESTRAIL_RELEASE_DIR} && \
chown -R www-data:www-data /var/www/testrail && \
chown -R www-data:www-data /opt/testrail


COPY apache_testrail.conf /${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf
COPY run.sh /run.sh

WORKDIR /var/www/testrail
EXPOSE 80

CMD ["/run.sh"]
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,11 @@

ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined

<Directory /var/www/>
Options Indexes FollowSymLinks
AllowOverride All
Require all granted
</Directory>

</VirtualHost>
3 changes: 0 additions & 3 deletions testrail/latest/.htaccess

This file was deleted.

72 changes: 0 additions & 72 deletions testrail/latest/Dockerfile

This file was deleted.

13 changes: 0 additions & 13 deletions testrail/latest/README.md

This file was deleted.

Loading

0 comments on commit f03ed1d

Please sign in to comment.