This commit is contained in:
Anatolii Zimovskii 2022-03-21 18:36:40 +03:00
parent 523fe96be5
commit 496166bbc5
Signed by: stam
GPG Key ID: AA3A575AB99E8469
25 changed files with 171 additions and 53 deletions

View File

@ -259,4 +259,13 @@ bundle-atlassian:
cd `pwd`/linux/ecosystem/atlassian/crucible/latest && pwd && make cd `pwd`/linux/ecosystem/atlassian/crucible/latest && pwd && make
cd `pwd`/linux/ecosystem/atlassian/fisheye/latest && pwd && make cd `pwd`/linux/ecosystem/atlassian/fisheye/latest && pwd && make
cd `pwd`/linux/ecosystem/atlassian/fisheye-crucible/latest && pwd && make cd `pwd`/linux/ecosystem/atlassian/fisheye-crucible/latest && pwd && make
cd `pwd`/linux/ecosystem/atlassian/jira/latest && pwd && make cd `pwd`/linux/ecosystem/atlassian/jira/latest && pwd && make
bundle-web:
@echo "======================================="
@echo "===== Building web images ====="
@echo "======================================="
make ecosystem-php-images
make ecosystem-apache2-images
make ecosystem-nginx-images

View File

@ -99,14 +99,17 @@ RUN apt clean -y && \
rm -rfv /tmp/composer-setup.php && \ rm -rfv /tmp/composer-setup.php && \
rm -rfv /tmp/ioncube.tar.gz rm -rfv /tmp/ioncube.tar.gz
#volumes #healthcheck. good practice
VOLUME ["/var/www"] HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
# Add image configuration and scripts # Add image configuration and scripts
COPY run.sh /run.sh COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN chmod 755 /*.sh RUN chmod 755 /usr/bin/docker-entrypoint.sh
# Configure application #Final config
EXPOSE 80 VOLUME ["/var/www"]
WORKDIR /var/www/ WORKDIR /var/www/
CMD ["/run.sh"] EXPOSE 80 443
ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
CMD ["docker-entrypoint.sh"]

View File

@ -92,14 +92,17 @@ RUN apt clean -y && \
rm -rfv /tmp/composer-setup.php && \ rm -rfv /tmp/composer-setup.php && \
rm -rfv /tmp/ioncube.tar.gz rm -rfv /tmp/ioncube.tar.gz
#volumes #healthcheck. good practice
VOLUME ["/var/www"] HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
# Add image configuration and scripts # Add image configuration and scripts
COPY run.sh /run.sh COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN chmod 755 /*.sh RUN chmod 755 /usr/bin/docker-entrypoint.sh
# Configure application #Final config
EXPOSE 80 VOLUME ["/var/www"]
WORKDIR /var/www/ WORKDIR /var/www/
CMD ["/run.sh"] EXPOSE 80 443
ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
CMD ["docker-entrypoint.sh"]

View File

@ -92,14 +92,17 @@ RUN apt clean -y && \
rm -rfv /tmp/composer-setup.php && \ rm -rfv /tmp/composer-setup.php && \
rm -rfv /tmp/ioncube.tar.gz rm -rfv /tmp/ioncube.tar.gz
#volumes #healthcheck. good practice
VOLUME ["/var/www"] HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
# Add image configuration and scripts # Add image configuration and scripts
COPY run.sh /run.sh COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN chmod 755 /*.sh RUN chmod 755 /usr/bin/docker-entrypoint.sh
# Configure application #Final config
EXPOSE 80 VOLUME ["/var/www"]
WORKDIR /var/www/ WORKDIR /var/www/
CMD ["/run.sh"] EXPOSE 80 443
ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
CMD ["docker-entrypoint.sh"]

View File

@ -99,14 +99,17 @@ RUN apt clean -y && \
rm -rfv /tmp/composer-setup.php && \ rm -rfv /tmp/composer-setup.php && \
rm -rfv /tmp/ioncube.tar.gz rm -rfv /tmp/ioncube.tar.gz
#volumes #healthcheck. good practice
VOLUME ["/var/www"] HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
# Add image configuration and scripts # Add image configuration and scripts
COPY run.sh /run.sh COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN chmod 755 /*.sh RUN chmod 755 /usr/bin/docker-entrypoint.sh
# Configure application #Final config
EXPOSE 80 VOLUME ["/var/www"]
WORKDIR /var/www/ WORKDIR /var/www/
CMD ["/run.sh"] EXPOSE 80 443
ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
CMD ["docker-entrypoint.sh"]

View File

@ -100,14 +100,17 @@ RUN apt clean -y && \
rm -rfv /tmp/composer-setup.php && \ rm -rfv /tmp/composer-setup.php && \
rm -rfv /tmp/ioncube.tar.gz rm -rfv /tmp/ioncube.tar.gz
#volumes #healthcheck. good practice
VOLUME ["/var/www"] HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
# Add image configuration and scripts # Add image configuration and scripts
COPY run.sh /run.sh COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN chmod 755 /*.sh RUN chmod 755 /usr/bin/docker-entrypoint.sh
# Configure application #Final config
EXPOSE 80 VOLUME ["/var/www"]
WORKDIR /var/www/ WORKDIR /var/www/
CMD ["/run.sh"] EXPOSE 80 443
ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
CMD ["docker-entrypoint.sh"]

View File

@ -239,8 +239,16 @@ RUN apt-get update && \
rm -rf /builds/* && \ rm -rf /builds/* && \
rm -rf /valve/* rm -rf /valve/*
#healthcheck. good practice
HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
# Add image configuration and scripts
COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN chmod 755 /usr/bin/docker-entrypoint.sh
#Final config #Final config
VOLUME ["/var/cache/nginx"] VOLUME ["/var/cache/nginx"]
EXPOSE 80 443 EXPOSE 80 443
CMD ["nginx", "-g", "daemon off;"] ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
CMD ["docker-entrypoint.sh"]

View File

@ -0,0 +1,16 @@
#!/bin/bash
if [[ -z "${FIX_WWW_DATA}" ]]; then
echo "[nginx] env FIX_WWW_DATA is not set. Skipping..."
elif [ "${FIX_WWW_DATA}" == "false" ]; then
echo "[nginx] env FIX_WWW_DATA is set to false. Skipping..."
elif [ "${FIX_WWW_DATA}" == "true" ]; then
echo "[nginx] Changing permissions for /var/www path. Dont worry, please wait."
chown www-data:www-data /var/www -R
echo "[nginx] Done"
else
echo "[nginx] env FIX_WWW_DATA is set to strange value. Skipping..."
fi
echo "[nginx] Starting up"
nginx -g 'daemon off;'

View File

@ -250,8 +250,16 @@ RUN apt clean -y && \
rm -rfv /tmp/composer-setup.php && \ rm -rfv /tmp/composer-setup.php && \
rm -rfv /tmp/ioncube.tar.gz rm -rfv /tmp/ioncube.tar.gz
#healthcheck. good practice
HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
# Add image configuration and scripts
COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN chmod 755 /usr/bin/docker-entrypoint.sh
#Final config #Final config
VOLUME ["/var/cache/nginx"] VOLUME ["/var/cache/nginx"]
EXPOSE 80 443 EXPOSE 80 443
CMD ["nginx", "-g", "daemon off;"] ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
CMD ["docker-entrypoint.sh"]

View File

@ -0,0 +1,16 @@
#!/bin/bash
if [[ -z "${FIX_WWW_DATA}" ]]; then
echo "[nginx] env FIX_WWW_DATA is not set. Skipping..."
elif [ "${FIX_WWW_DATA}" == "false" ]; then
echo "[nginx] env FIX_WWW_DATA is set to false. Skipping..."
elif [ "${FIX_WWW_DATA}" == "true" ]; then
echo "[nginx] Changing permissions for /var/www path. Dont worry, please wait."
chown www-data:www-data /var/www -R
echo "[nginx] Done"
else
echo "[nginx] env FIX_WWW_DATA is set to strange value. Skipping..."
fi
echo "[nginx] Starting up"
nginx -g 'daemon off;'

View File

@ -0,0 +1,16 @@
#!/bin/bash
if [[ -z "${FIX_WWW_DATA}" ]]; then
echo "[nginx] env FIX_WWW_DATA is not set. Skipping..."
elif [ "${FIX_WWW_DATA}" == "false" ]; then
echo "[nginx] env FIX_WWW_DATA is set to false. Skipping..."
elif [ "${FIX_WWW_DATA}" == "true" ]; then
echo "[nginx] Changing permissions for /var/www path. Dont worry, please wait."
chown www-data:www-data /var/www -R
echo "[nginx] Done"
else
echo "[nginx] env FIX_WWW_DATA is set to strange value. Skipping..."
fi
echo "[nginx] Starting up"
nginx -g 'daemon off;'

View File

@ -38,7 +38,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
libx264-dev \ libx264-dev \
libx265-dev libx265-dev
################################################################## ##################################################################
# stretch sources list + libvpx # stretch sources list + libvpx
################################################################## ##################################################################
@ -49,7 +48,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
apt-get install -y --allow-unauthenticated \ apt-get install -y --allow-unauthenticated \
libvpx4 libvpx4
################################################################## ##################################################################
# buster sources list + libvpx # buster sources list + libvpx
################################################################## ##################################################################
@ -60,7 +58,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
apt-get install -y --allow-unauthenticated \ apt-get install -y --allow-unauthenticated \
libvpx5 libvpx5
################################################################## ##################################################################
# sid sources list + libvpx # sid sources list + libvpx
################################################################## ##################################################################
@ -71,7 +68,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
apt-get install -y --allow-unauthenticated \ apt-get install -y --allow-unauthenticated \
libvpx6 libvpx6
################################################################## ##################################################################
# installing deps for rtmp module # installing deps for rtmp module
################################################################## ##################################################################
@ -120,8 +116,16 @@ RUN apt clean -y && \
rm -rfv /var/lib/apt/lists/* && \ rm -rfv /var/lib/apt/lists/* && \
rm -rfv /var/cache/apt/archives/*.deb rm -rfv /var/cache/apt/archives/*.deb
#healthcheck. good practice
HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
EXPOSE 1935 # Add image configuration and scripts
EXPOSE 8080 COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN chmod 755 /usr/bin/docker-entrypoint.sh
CMD ["nginx", "-g", "daemon off;"] #Final config
VOLUME ["/var/cache/nginx"]
EXPOSE 80 443 1935 8080
ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
CMD ["docker-entrypoint.sh"]

View File

@ -0,0 +1,16 @@
#!/bin/bash
if [[ -z "${FIX_WWW_DATA}" ]]; then
echo "[nginx] env FIX_WWW_DATA is not set. Skipping..."
elif [ "${FIX_WWW_DATA}" == "false" ]; then
echo "[nginx] env FIX_WWW_DATA is set to false. Skipping..."
elif [ "${FIX_WWW_DATA}" == "true" ]; then
echo "[nginx] Changing permissions for /var/www path. Dont worry, please wait."
chown www-data:www-data /var/www -R
echo "[nginx] Done"
else
echo "[nginx] env FIX_WWW_DATA is set to strange value. Skipping..."
fi
echo "[nginx] Starting up"
nginx -g 'daemon off;'

View File

@ -7,7 +7,7 @@ ENV TESTRAIL_PLUGIN_FILE=${TESTRAIL_PLUGIN_FULLNAME}.zip
ENV TESTRAIL_PLUGIN_DONWLOAD_URL=https://media.gurock.com/gk-media/downloads/${TESTRAIL_PLUGIN_FILE} ENV TESTRAIL_PLUGIN_DONWLOAD_URL=https://media.gurock.com/gk-media/downloads/${TESTRAIL_PLUGIN_FILE}
ENV TESTRAIL_PLUGIN_TEMP=${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE} ENV TESTRAIL_PLUGIN_TEMP=${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE}
RUN rm -rfv /run.sh RUN rm -rfv /usr/bin/docker-entrypoint.sh
COPY run.sh /run.sh COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN wget --no-check-certificate -O ${TESTRAIL_PLUGIN_TEMP} ${TESTRAIL_PLUGIN_DONWLOAD_URL} RUN wget --no-check-certificate -O ${TESTRAIL_PLUGIN_TEMP} ${TESTRAIL_PLUGIN_DONWLOAD_URL}

View File

@ -46,11 +46,18 @@ RUN \
chown -R www-data:www-data ${TR_OPT_PATH} && \ chown -R www-data:www-data ${TR_OPT_PATH} && \
ls -las ${TR_OPT_PATH} ls -las ${TR_OPT_PATH}
COPY apache_testrail.conf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf COPY apache_testrail.conf ${TESTRAIL_RELEASE_DIR}/apache-conf/000-default.conf
COPY run.sh /run.sh
#healthcheck. good practice
HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:80/ || exit 1
# Add image configuration and scripts
COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN chmod 755 /usr/bin/docker-entrypoint.sh
#Final config
WORKDIR /var/www/testrail WORKDIR /var/www/testrail
EXPOSE 80 EXPOSE 80 443
CMD ["/run.sh"] ENTRYPOINT ["tini", "-s", "--", "docker-entrypoint.sh"]
CMD ["docker-entrypoint.sh"]

View File

@ -7,7 +7,7 @@ ENV TESTRAIL_PLUGIN_FILE=${TESTRAIL_PLUGIN_FULLNAME}.zip
ENV TESTRAIL_PLUGIN_DONWLOAD_URL=https://media.gurock.com/gk-media/downloads/${TESTRAIL_PLUGIN_FILE} ENV TESTRAIL_PLUGIN_DONWLOAD_URL=https://media.gurock.com/gk-media/downloads/${TESTRAIL_PLUGIN_FILE}
ENV TESTRAIL_PLUGIN_TEMP=${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE} ENV TESTRAIL_PLUGIN_TEMP=${TESTRAIL_RELEASE_DIR}/${TESTRAIL_PLUGIN_FILE}
RUN rm -rfv /run.sh RUN rm -rfv /usr/bin/docker-entrypoint.sh
COPY run.sh /run.sh COPY docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
RUN wget --no-check-certificate -O ${TESTRAIL_PLUGIN_TEMP} ${TESTRAIL_PLUGIN_DONWLOAD_URL} RUN wget --no-check-certificate -O ${TESTRAIL_PLUGIN_TEMP} ${TESTRAIL_PLUGIN_DONWLOAD_URL}

View File

@ -24,4 +24,7 @@ EXPOSE \
VOLUME \ VOLUME \
/config /config
#healthcheck. good practice
HEALTHCHECK --interval=2m --timeout=3s CMD curl -f http://localhost:${UI_PORT}/ || exit 1
ENTRYPOINT /opt/torrServer --port $UI_PORT -path /config ENTRYPOINT /opt/torrServer --port $UI_PORT -path /config