From 4eceda5a6591a9aaaf06ca8991c43485fc619d85 Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 24 Nov 2020 16:19:52 +0300 Subject: [PATCH] some rework --- .github/workflows/docker-develop.yml | 7 +- .github/workflows/docker-master.yml | 9 +- {teamcity-agent => teamcity/agent}/Dockerfile | 0 {teamcity-agent => teamcity/agent}/Makefile | 0 .../agent}/run-agent.sh | 0 .../agent}/run-docker.sh | 0 .../agent}/run-services.sh | 0 teamcity/server/Dockerfile | 74 +++ teamcity/server/Makefile | 4 + teamcity/server/locale.gen | 12 + teamcity/server/locale.gen.full | 496 ++++++++++++++++++ teamcity/server/sources.list | 17 + testrail/{ => latest}/Dockerfile | 0 testrail/{ => latest}/Makefile | 0 testrail/{ => latest}/apache_testrail.conf | 0 testrail/{ => latest}/run.sh | 0 zabbix/agent/Dockerfile | 8 +- zabbix/java-gateway/Dockerfile | 8 +- zabbix/proxy/Dockerfile | 8 +- zabbix/server/Dockerfile | 8 +- zabbix/web/Dockerfile | 9 +- 21 files changed, 645 insertions(+), 15 deletions(-) rename {teamcity-agent => teamcity/agent}/Dockerfile (100%) rename {teamcity-agent => teamcity/agent}/Makefile (100%) rename {teamcity-agent => teamcity/agent}/run-agent.sh (100%) rename {teamcity-agent => teamcity/agent}/run-docker.sh (100%) rename {teamcity-agent => teamcity/agent}/run-services.sh (100%) create mode 100644 teamcity/server/Dockerfile create mode 100644 teamcity/server/Makefile create mode 100644 teamcity/server/locale.gen create mode 100644 teamcity/server/locale.gen.full create mode 100644 teamcity/server/sources.list rename testrail/{ => latest}/Dockerfile (100%) rename testrail/{ => latest}/Makefile (100%) rename testrail/{ => latest}/apache_testrail.conf (100%) rename testrail/{ => latest}/run.sh (100%) diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml index 85f3a8f7f..885bdbf77 100644 --- a/.github/workflows/docker-develop.yml +++ b/.github/workflows/docker-develop.yml @@ -40,6 +40,9 @@ jobs: - name: Build NextCloud (latest) run: docker build --compress -t epicmorg/nextcloud:latest nextcloud/latest + - name: Build TeamCity Server (latest) + run: docker build --compress -t epicmorg/teamcity-server:latest teamcity/server + ######################################### #### Our High priority images ######################################### @@ -110,7 +113,7 @@ jobs: ########## - name: Build TeamCity Agent - run: docker build --compress -t epicmorg/teamcity-agent:latest teamcity-agent + run: docker build --compress -t epicmorg/teamcity-agent:latest teamcity/agent - name: Build NGinx (latest) run: docker build --compress -t epicmorg/balancer:latest balancer/latest @@ -134,7 +137,7 @@ jobs: run: docker build --compress -t epicmorg/websites:php7.2 websites/php7.2 - name: Build Testrail (always latest) - run: docker build --compress -t epicmorg/testrail:latest testrail + run: docker build --compress -t epicmorg/testrail:latest testrail/latest - name: Build PostgresSQL (latest) run: docker build --compress -t epicmorg/postgres:latest postgres/latest diff --git a/.github/workflows/docker-master.yml b/.github/workflows/docker-master.yml index ed80e5a03..5f2ab08ff 100644 --- a/.github/workflows/docker-master.yml +++ b/.github/workflows/docker-master.yml @@ -49,6 +49,11 @@ jobs: - name: Push NextCloud (latest) run: docker push epicmorg/nextcloud:latest + - name: Build TeamCity Server (latest) + run: docker build --compress -t epicmorg/teamcity-server:latest teamcity/server + - name: Build TeamCity Server (latest) + run: docker push epicmorg/teamcity-server:latest + ######################################### #### Our High priority images ######################################### @@ -151,7 +156,7 @@ jobs: ########## - name: Build TeamCity Agent - run: docker build --compress -t epicmorg/teamcity-agent:latest teamcity-agent + run: docker build --compress -t epicmorg/teamcity-agent:latest teamcity/agent - name: Push TeamCity Agent run: docker push epicmorg/teamcity-agent:latest @@ -191,7 +196,7 @@ jobs: run: docker push epicmorg/websites:php7.2 - name: Build Testrail (always latest) - run: docker build --compress -t epicmorg/testrail:latest testrail + run: docker build --compress -t epicmorg/testrail:latest testrail/latest - name: Push Testrail (always latest) run: docker push epicmorg/testrail:latest diff --git a/teamcity-agent/Dockerfile b/teamcity/agent/Dockerfile similarity index 100% rename from teamcity-agent/Dockerfile rename to teamcity/agent/Dockerfile diff --git a/teamcity-agent/Makefile b/teamcity/agent/Makefile similarity index 100% rename from teamcity-agent/Makefile rename to teamcity/agent/Makefile diff --git a/teamcity-agent/run-agent.sh b/teamcity/agent/run-agent.sh similarity index 100% rename from teamcity-agent/run-agent.sh rename to teamcity/agent/run-agent.sh diff --git a/teamcity-agent/run-docker.sh b/teamcity/agent/run-docker.sh similarity index 100% rename from teamcity-agent/run-docker.sh rename to teamcity/agent/run-docker.sh diff --git a/teamcity-agent/run-services.sh b/teamcity/agent/run-services.sh similarity index 100% rename from teamcity-agent/run-services.sh rename to teamcity/agent/run-services.sh diff --git a/teamcity/server/Dockerfile b/teamcity/server/Dockerfile new file mode 100644 index 000000000..ce55b17a7 --- /dev/null +++ b/teamcity/server/Dockerfile @@ -0,0 +1,74 @@ +FROM jetbrains/teamcity-server +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# editing sources list +################################################################## +COPY sources.list /etc/apt/sources.list +COPY locale.gen /etc/locale.gen + +################################################################## +# perforce client binary +################################################################## +ARG P4_VERSION=r20.1 +ARG P4_DOWNLOAD_URL=http://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 + +################################################################## +# installing utils +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get update && \ + apt-get install -y --allow-unauthenticated \ + apt-transport-https \ + apt-utils \ + bash \ + binutils \ + ca-certificates \ + cmatrix \ + cmatrix-xfont \ + console-cyrillic \ + cron \ + curl \ + ffmpeg \ + fontconfig \ + git \ + gnupg \ + gnupg2 \ + graphicsmagick \ + htop \ + iftop \ + iputils-ping \ + jq \ + kmod \ + libsvn-java \ + locales \ + lsb-release \ + lsof \ + lynx \ + mc \ + mercurial \ + nano \ + nload \ + nmap \ + openssl \ + perl \ + procps \ + rsync \ + screenfetch \ + smbclient \ + software-properties-common \ + subversion \ + sudo \ + telnet \ + tini \ + tmux \ + tree \ + ttf-dejavu \ + util-linux \ + uuid-runtime \ + wget \ + zip && \ + wget -nv --random-wait -c -P /usr/bin ${P4_DOWNLOAD_URL} && \ + chmod +x /usr/bin/p4 + diff --git a/teamcity/server/Makefile b/teamcity/server/Makefile new file mode 100644 index 000000000..ef347f552 --- /dev/null +++ b/teamcity/server/Makefile @@ -0,0 +1,4 @@ +all: tcs +tcs: + docker build --compress -t epicmorg/teamcity-server:latest . + docker push epicmorg/teamcity-server:latest diff --git a/teamcity/server/locale.gen b/teamcity/server/locale.gen new file mode 100644 index 000000000..02f100afa --- /dev/null +++ b/teamcity/server/locale.gen @@ -0,0 +1,12 @@ +en_GB.UTF-8 UTF-8 +en_GB ISO-8859-1 +en_GB.ISO-8859-15 ISO-8859-15 +en_US.UTF-8 UTF-8 +en_US ISO-8859-1 +en_US.ISO-8859-15 ISO-8859-15 +ru_RU.UTF-8 UTF-8 +ru_RU.KOI8-R KOI8-R +ru_RU ISO-8859-5 +ru_RU.CP1251 CP1251 +ru_UA.UTF-8 UTF-8 +ru_UA KOI8-U diff --git a/teamcity/server/locale.gen.full b/teamcity/server/locale.gen.full new file mode 100644 index 000000000..602141659 --- /dev/null +++ b/teamcity/server/locale.gen.full @@ -0,0 +1,496 @@ +aa_DJ.UTF-8 UTF-8 +aa_DJ ISO-8859-1 +aa_ER UTF-8 +aa_ER@saaho UTF-8 +aa_ET UTF-8 +af_ZA.UTF-8 UTF-8 +af_ZA ISO-8859-1 +agr_PE UTF-8 +ak_GH UTF-8 +am_ET UTF-8 +an_ES.UTF-8 UTF-8 +an_ES ISO-8859-15 +anp_IN UTF-8 +ar_AE.UTF-8 UTF-8 +ar_AE ISO-8859-6 +ar_BH.UTF-8 UTF-8 +ar_BH ISO-8859-6 +ar_DZ.UTF-8 UTF-8 +ar_DZ ISO-8859-6 +ar_EG.UTF-8 UTF-8 +ar_EG ISO-8859-6 +ar_IN UTF-8 +ar_IQ.UTF-8 UTF-8 +ar_IQ ISO-8859-6 +ar_JO.UTF-8 UTF-8 +ar_JO ISO-8859-6 +ar_KW.UTF-8 UTF-8 +ar_KW ISO-8859-6 +ar_LB.UTF-8 UTF-8 +ar_LB ISO-8859-6 +ar_LY.UTF-8 UTF-8 +ar_LY ISO-8859-6 +ar_MA.UTF-8 UTF-8 +ar_MA ISO-8859-6 +ar_OM.UTF-8 UTF-8 +ar_OM ISO-8859-6 +ar_QA.UTF-8 UTF-8 +ar_QA ISO-8859-6 +ar_SA.UTF-8 UTF-8 +ar_SA ISO-8859-6 +ar_SD.UTF-8 UTF-8 +ar_SD ISO-8859-6 +ar_SS UTF-8 +ar_SY.UTF-8 UTF-8 +ar_SY ISO-8859-6 +ar_TN.UTF-8 UTF-8 +ar_TN ISO-8859-6 +ar_YE.UTF-8 UTF-8 +ar_YE ISO-8859-6 +ayc_PE UTF-8 +az_AZ UTF-8 +az_IR UTF-8 +as_IN UTF-8 +ast_ES.UTF-8 UTF-8 +ast_ES ISO-8859-15 +be_BY.UTF-8 UTF-8 +be_BY CP1251 +be_BY@latin UTF-8 +bem_ZM UTF-8 +ber_DZ UTF-8 +ber_MA UTF-8 +bg_BG.UTF-8 UTF-8 +bg_BG CP1251 +bhb_IN.UTF-8 UTF-8 +bho_IN UTF-8 +bho_NP UTF-8 +bi_VU UTF-8 +bn_BD UTF-8 +bn_IN UTF-8 +bo_CN UTF-8 +bo_IN UTF-8 +br_FR.UTF-8 UTF-8 +br_FR ISO-8859-1 +br_FR@euro ISO-8859-15 +brx_IN UTF-8 +bs_BA.UTF-8 UTF-8 +bs_BA ISO-8859-2 +byn_ER UTF-8 +ca_AD.UTF-8 UTF-8 +ca_AD ISO-8859-15 +ca_ES.UTF-8 UTF-8 +ca_ES ISO-8859-1 +ca_ES@euro ISO-8859-15 +ca_ES@valencia UTF-8 +ca_FR.UTF-8 UTF-8 +ca_FR ISO-8859-15 +ca_IT.UTF-8 UTF-8 +ca_IT ISO-8859-15 +ce_RU UTF-8 +chr_US UTF-8 +cmn_TW UTF-8 +crh_UA UTF-8 +cs_CZ.UTF-8 UTF-8 +cs_CZ ISO-8859-2 +csb_PL UTF-8 +cv_RU UTF-8 +cy_GB.UTF-8 UTF-8 +cy_GB ISO-8859-14 +da_DK.UTF-8 UTF-8 +da_DK ISO-8859-1 +de_AT.UTF-8 UTF-8 +de_AT ISO-8859-1 +de_AT@euro ISO-8859-15 +de_BE.UTF-8 UTF-8 +de_BE ISO-8859-1 +de_BE@euro ISO-8859-15 +de_CH.UTF-8 UTF-8 +de_CH ISO-8859-1 +de_DE.UTF-8 UTF-8 +de_DE ISO-8859-1 +de_DE@euro ISO-8859-15 +de_IT.UTF-8 UTF-8 +de_IT ISO-8859-1 +de_LI.UTF-8 UTF-8 +de_LU.UTF-8 UTF-8 +de_LU ISO-8859-1 +de_LU@euro ISO-8859-15 +doi_IN UTF-8 +dsb_DE UTF-8 +dv_MV UTF-8 +dz_BT UTF-8 +el_GR.UTF-8 UTF-8 +el_GR ISO-8859-7 +el_GR@euro ISO-8859-7 +el_CY.UTF-8 UTF-8 +el_CY ISO-8859-7 +en_AG UTF-8 +en_AU.UTF-8 UTF-8 +en_AU ISO-8859-1 +en_BW.UTF-8 UTF-8 +en_BW ISO-8859-1 +en_CA.UTF-8 UTF-8 +en_CA ISO-8859-1 +en_DK.UTF-8 UTF-8 +en_DK.ISO-8859-15 ISO-8859-15 +en_DK ISO-8859-1 +en_GB.UTF-8 UTF-8 +en_GB ISO-8859-1 +en_GB.ISO-8859-15 ISO-8859-15 +en_HK.UTF-8 UTF-8 +en_HK ISO-8859-1 +en_IE.UTF-8 UTF-8 +en_IE ISO-8859-1 +en_IE@euro ISO-8859-15 +en_IL UTF-8 +en_IN UTF-8 +en_NG UTF-8 +en_NZ.UTF-8 UTF-8 +en_NZ ISO-8859-1 +en_PH.UTF-8 UTF-8 +en_PH ISO-8859-1 +en_SC.UTF-8 UTF-8 +en_SG.UTF-8 UTF-8 +en_SG ISO-8859-1 +en_US.UTF-8 UTF-8 +en_US ISO-8859-1 +en_US.ISO-8859-15 ISO-8859-15 +en_ZA.UTF-8 UTF-8 +en_ZA ISO-8859-1 +en_ZM UTF-8 +en_ZW.UTF-8 UTF-8 +en_ZW ISO-8859-1 +eo UTF-8 +es_AR.UTF-8 UTF-8 +es_AR ISO-8859-1 +es_BO.UTF-8 UTF-8 +es_BO ISO-8859-1 +es_CL.UTF-8 UTF-8 +es_CL ISO-8859-1 +es_CO.UTF-8 UTF-8 +es_CO ISO-8859-1 +es_CR.UTF-8 UTF-8 +es_CR ISO-8859-1 +es_CU UTF-8 +es_DO.UTF-8 UTF-8 +es_DO ISO-8859-1 +es_EC.UTF-8 UTF-8 +es_EC ISO-8859-1 +es_ES.UTF-8 UTF-8 +es_ES ISO-8859-1 +es_ES@euro ISO-8859-15 +es_GT.UTF-8 UTF-8 +es_GT ISO-8859-1 +es_HN.UTF-8 UTF-8 +es_HN ISO-8859-1 +es_MX.UTF-8 UTF-8 +es_MX ISO-8859-1 +es_NI.UTF-8 UTF-8 +es_NI ISO-8859-1 +es_PA.UTF-8 UTF-8 +es_PA ISO-8859-1 +es_PE.UTF-8 UTF-8 +es_PE ISO-8859-1 +es_PR.UTF-8 UTF-8 +es_PR ISO-8859-1 +es_PY.UTF-8 UTF-8 +es_PY ISO-8859-1 +es_SV.UTF-8 UTF-8 +es_SV ISO-8859-1 +es_US.UTF-8 UTF-8 +es_US ISO-8859-1 +es_UY.UTF-8 UTF-8 +es_UY ISO-8859-1 +es_VE.UTF-8 UTF-8 +es_VE ISO-8859-1 +et_EE.UTF-8 UTF-8 +et_EE ISO-8859-1 +et_EE.ISO-8859-15 ISO-8859-15 +eu_ES.UTF-8 UTF-8 +eu_ES ISO-8859-1 +eu_ES@euro ISO-8859-15 +eu_FR.UTF-8 UTF-8 +eu_FR ISO-8859-1 +eu_FR@euro ISO-8859-15 +fa_IR UTF-8 +ff_SN UTF-8 +fi_FI.UTF-8 UTF-8 +fi_FI ISO-8859-1 +fi_FI@euro ISO-8859-15 +fil_PH UTF-8 +fo_FO.UTF-8 UTF-8 +fo_FO ISO-8859-1 +fr_BE.UTF-8 UTF-8 +fr_BE ISO-8859-1 +fr_BE@euro ISO-8859-15 +fr_CA.UTF-8 UTF-8 +fr_CA ISO-8859-1 +fr_CH.UTF-8 UTF-8 +fr_CH ISO-8859-1 +fr_FR.UTF-8 UTF-8 +fr_FR ISO-8859-1 +fr_FR@euro ISO-8859-15 +fr_LU.UTF-8 UTF-8 +fr_LU ISO-8859-1 +fr_LU@euro ISO-8859-15 +fur_IT UTF-8 +fy_NL UTF-8 +fy_DE UTF-8 +ga_IE.UTF-8 UTF-8 +ga_IE ISO-8859-1 +ga_IE@euro ISO-8859-15 +gd_GB.UTF-8 UTF-8 +gd_GB ISO-8859-15 +gez_ER UTF-8 +gez_ER@abegede UTF-8 +gez_ET UTF-8 +gez_ET@abegede UTF-8 +gl_ES.UTF-8 UTF-8 +gl_ES ISO-8859-1 +gl_ES@euro ISO-8859-15 +gu_IN UTF-8 +gv_GB.UTF-8 UTF-8 +gv_GB ISO-8859-1 +ha_NG UTF-8 +hak_TW UTF-8 +he_IL.UTF-8 UTF-8 +he_IL ISO-8859-8 +hi_IN UTF-8 +hif_FJ UTF-8 +hne_IN UTF-8 +hr_HR.UTF-8 UTF-8 +hr_HR ISO-8859-2 +hsb_DE.UTF-8 UTF-8 +hsb_DE ISO-8859-2 +ht_HT UTF-8 +hu_HU.UTF-8 UTF-8 +hu_HU ISO-8859-2 +hy_AM UTF-8 +hy_AM.ARMSCII-8 ARMSCII-8 +ia_FR UTF-8 +id_ID.UTF-8 UTF-8 +id_ID ISO-8859-1 +ig_NG UTF-8 +ik_CA UTF-8 +is_IS.UTF-8 UTF-8 +is_IS ISO-8859-1 +it_CH.UTF-8 UTF-8 +it_CH ISO-8859-1 +it_IT.UTF-8 UTF-8 +it_IT ISO-8859-1 +it_IT@euro ISO-8859-15 +iu_CA UTF-8 +ja_JP.UTF-8 UTF-8 +ja_JP.EUC-JP EUC-JP +ka_GE.UTF-8 UTF-8 +ka_GE GEORGIAN-PS +kab_DZ UTF-8 +kk_KZ.UTF-8 UTF-8 +kk_KZ PT154 +kk_KZ.RK1048 RK1048 +kl_GL.UTF-8 UTF-8 +kl_GL ISO-8859-1 +km_KH UTF-8 +kn_IN UTF-8 +ko_KR.UTF-8 UTF-8 +ko_KR.EUC-KR EUC-KR +kok_IN UTF-8 +ks_IN UTF-8 +ks_IN@devanagari UTF-8 +ku_TR.UTF-8 UTF-8 +ku_TR ISO-8859-9 +kw_GB.UTF-8 UTF-8 +kw_GB ISO-8859-1 +ky_KG UTF-8 +lb_LU UTF-8 +lg_UG.UTF-8 UTF-8 +lg_UG ISO-8859-10 +li_BE UTF-8 +li_NL UTF-8 +lij_IT UTF-8 +ln_CD UTF-8 +lo_LA UTF-8 +lt_LT.UTF-8 UTF-8 +lt_LT ISO-8859-13 +lv_LV.UTF-8 UTF-8 +lv_LV ISO-8859-13 +lzh_TW UTF-8 +mag_IN UTF-8 +mai_IN UTF-8 +mai_NP UTF-8 +mfe_MU UTF-8 +mg_MG.UTF-8 UTF-8 +mg_MG ISO-8859-15 +mhr_RU UTF-8 +mi_NZ.UTF-8 UTF-8 +mi_NZ ISO-8859-13 +miq_NI UTF-8 +mjw_IN UTF-8 +mk_MK.UTF-8 UTF-8 +mk_MK ISO-8859-5 +ml_IN UTF-8 +mn_MN UTF-8 +mni_IN UTF-8 +mr_IN UTF-8 +ms_MY.UTF-8 UTF-8 +ms_MY ISO-8859-1 +mt_MT.UTF-8 UTF-8 +mt_MT ISO-8859-3 +my_MM UTF-8 +nan_TW UTF-8 +nan_TW@latin UTF-8 +nb_NO.UTF-8 UTF-8 +nb_NO ISO-8859-1 +nds_DE UTF-8 +nds_NL UTF-8 +ne_NP UTF-8 +nhn_MX UTF-8 +niu_NU UTF-8 +niu_NZ UTF-8 +nl_AW UTF-8 +nl_BE.UTF-8 UTF-8 +nl_BE ISO-8859-1 +nl_BE@euro ISO-8859-15 +nl_NL.UTF-8 UTF-8 +nl_NL ISO-8859-1 +nl_NL@euro ISO-8859-15 +nn_NO.UTF-8 UTF-8 +nn_NO ISO-8859-1 +nr_ZA UTF-8 +nso_ZA UTF-8 +oc_FR.UTF-8 UTF-8 +oc_FR ISO-8859-1 +om_ET UTF-8 +om_KE.UTF-8 UTF-8 +om_KE ISO-8859-1 +or_IN UTF-8 +os_RU UTF-8 +pa_IN UTF-8 +pa_PK UTF-8 +pap_AW UTF-8 +pap_CW UTF-8 +pl_PL.UTF-8 UTF-8 +pl_PL ISO-8859-2 +ps_AF UTF-8 +pt_BR.UTF-8 UTF-8 +pt_BR ISO-8859-1 +pt_PT.UTF-8 UTF-8 +pt_PT ISO-8859-1 +pt_PT@euro ISO-8859-15 +quz_PE UTF-8 +raj_IN UTF-8 +ro_RO.UTF-8 UTF-8 +ro_RO ISO-8859-2 +ru_RU.UTF-8 UTF-8 +ru_RU.KOI8-R KOI8-R +ru_RU ISO-8859-5 +ru_RU.CP1251 CP1251 +ru_UA.UTF-8 UTF-8 +ru_UA KOI8-U +rw_RW UTF-8 +sa_IN UTF-8 +sah_RU UTF-8 +sat_IN UTF-8 +sc_IT UTF-8 +sd_IN UTF-8 +sd_IN@devanagari UTF-8 +se_NO UTF-8 +sgs_LT UTF-8 +shn_MM UTF-8 +shs_CA UTF-8 +si_LK UTF-8 +sid_ET UTF-8 +sk_SK.UTF-8 UTF-8 +sk_SK ISO-8859-2 +sl_SI.UTF-8 UTF-8 +sl_SI ISO-8859-2 +sm_WS UTF-8 +so_DJ.UTF-8 UTF-8 +so_DJ ISO-8859-1 +so_ET UTF-8 +so_KE.UTF-8 UTF-8 +so_KE ISO-8859-1 +so_SO.UTF-8 UTF-8 +so_SO ISO-8859-1 +sq_AL.UTF-8 UTF-8 +sq_AL ISO-8859-1 +sq_MK UTF-8 +sr_ME UTF-8 +sr_RS UTF-8 +sr_RS@latin UTF-8 +ss_ZA UTF-8 +st_ZA.UTF-8 UTF-8 +st_ZA ISO-8859-1 +sv_FI.UTF-8 UTF-8 +sv_FI ISO-8859-1 +sv_FI@euro ISO-8859-15 +sv_SE.UTF-8 UTF-8 +sv_SE ISO-8859-1 +sv_SE.ISO-8859-15 ISO-8859-15 +sw_KE UTF-8 +sw_TZ UTF-8 +szl_PL UTF-8 +ta_IN UTF-8 +ta_LK UTF-8 +tcy_IN.UTF-8 UTF-8 +te_IN UTF-8 +tg_TJ.UTF-8 UTF-8 +tg_TJ KOI8-T +th_TH.UTF-8 UTF-8 +th_TH TIS-620 +the_NP UTF-8 +ti_ER UTF-8 +ti_ET UTF-8 +tig_ER UTF-8 +tk_TM UTF-8 +tl_PH.UTF-8 UTF-8 +tl_PH ISO-8859-1 +tn_ZA UTF-8 +to_TO UTF-8 +tpi_PG UTF-8 +tr_CY.UTF-8 UTF-8 +tr_CY ISO-8859-9 +tr_TR.UTF-8 UTF-8 +tr_TR ISO-8859-9 +ts_ZA UTF-8 +tt_RU UTF-8 +tt_RU@iqtelif UTF-8 +ug_CN UTF-8 +uk_UA.UTF-8 UTF-8 +uk_UA KOI8-U +unm_US UTF-8 +ur_IN UTF-8 +ur_PK UTF-8 +uz_UZ.UTF-8 UTF-8 +uz_UZ ISO-8859-1 +uz_UZ@cyrillic UTF-8 +ve_ZA UTF-8 +vi_VN UTF-8 +wa_BE.UTF-8 UTF-8 +wa_BE ISO-8859-1 +wa_BE@euro ISO-8859-15 +wae_CH UTF-8 +wal_ET UTF-8 +wo_SN UTF-8 +xh_ZA.UTF-8 UTF-8 +xh_ZA ISO-8859-1 +yi_US.UTF-8 UTF-8 +yi_US CP1255 +yo_NG UTF-8 +yue_HK UTF-8 +yuw_PG UTF-8 +zh_CN.UTF-8 UTF-8 +zh_CN.GB18030 GB18030 +zh_CN.GBK GBK +zh_CN GB2312 +zh_HK.UTF-8 UTF-8 +zh_HK BIG5-HKSCS +zh_SG.UTF-8 UTF-8 +zh_SG.GBK GBK +zh_SG GB2312 +zh_TW.UTF-8 UTF-8 +zh_TW.EUC-TW EUC-TW +zh_TW BIG5 +zu_ZA.UTF-8 UTF-8 +zu_ZA ISO-8859-1 + diff --git a/teamcity/server/sources.list b/teamcity/server/sources.list new file mode 100644 index 000000000..bd9c1805f --- /dev/null +++ b/teamcity/server/sources.list @@ -0,0 +1,17 @@ +#------------------------------------------------------------------------------# +# OFFICIAL UBUNTU REPOS # +#------------------------------------------------------------------------------# + +###### Ubuntu Main Repos +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/ 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 diff --git a/testrail/Dockerfile b/testrail/latest/Dockerfile similarity index 100% rename from testrail/Dockerfile rename to testrail/latest/Dockerfile diff --git a/testrail/Makefile b/testrail/latest/Makefile similarity index 100% rename from testrail/Makefile rename to testrail/latest/Makefile diff --git a/testrail/apache_testrail.conf b/testrail/latest/apache_testrail.conf similarity index 100% rename from testrail/apache_testrail.conf rename to testrail/latest/apache_testrail.conf diff --git a/testrail/run.sh b/testrail/latest/run.sh similarity index 100% rename from testrail/run.sh rename to testrail/latest/run.sh diff --git a/zabbix/agent/Dockerfile b/zabbix/agent/Dockerfile index ea911effd..f2d6df3f7 100644 --- a/zabbix/agent/Dockerfile +++ b/zabbix/agent/Dockerfile @@ -3,11 +3,15 @@ ENV DEBIAN_FRONTEND noninteractive USER root -#editing sources list +################################################################## +# editing sources list +################################################################## COPY sources.list /etc/apt/sources.list COPY locale.gen /etc/locale.gen -# installing additional apps +################################################################## +# installing utils +################################################################## RUN apt update -y && \ apt install -y --allow-unauthenticated \ ca-certificates \ diff --git a/zabbix/java-gateway/Dockerfile b/zabbix/java-gateway/Dockerfile index 819c92f1f..9f3c3cde9 100644 --- a/zabbix/java-gateway/Dockerfile +++ b/zabbix/java-gateway/Dockerfile @@ -3,11 +3,15 @@ ENV DEBIAN_FRONTEND noninteractive USER root -#editing sources list +################################################################## +# editing sources list +################################################################## COPY sources.list /etc/apt/sources.list COPY locale.gen /etc/locale.gen -# installing additional apps +################################################################## +# installing utils +################################################################## RUN apt update -y && \ apt install -y --allow-unauthenticated \ ca-certificates \ diff --git a/zabbix/proxy/Dockerfile b/zabbix/proxy/Dockerfile index 4b2742b92..97f6f6dc4 100644 --- a/zabbix/proxy/Dockerfile +++ b/zabbix/proxy/Dockerfile @@ -3,11 +3,15 @@ ENV DEBIAN_FRONTEND noninteractive USER root -#editing sources list +################################################################## +# editing sources list +################################################################## COPY sources.list /etc/apt/sources.list COPY locale.gen /etc/locale.gen -# installing additional apps +################################################################## +# installing utils +################################################################## RUN apt update -y && \ apt install -y --allow-unauthenticated \ ca-certificates \ diff --git a/zabbix/server/Dockerfile b/zabbix/server/Dockerfile index 209d9b532..a8fb2d25b 100644 --- a/zabbix/server/Dockerfile +++ b/zabbix/server/Dockerfile @@ -3,11 +3,15 @@ ENV DEBIAN_FRONTEND noninteractive USER root -#editing sources list +################################################################## +# editing sources list +################################################################## COPY sources.list /etc/apt/sources.list COPY locale.gen /etc/locale.gen -# installing additional apps +################################################################## +# installing utils +################################################################## RUN apt update -y && \ apt install -y --allow-unauthenticated \ ca-certificates \ diff --git a/zabbix/web/Dockerfile b/zabbix/web/Dockerfile index d8067341c..979d3a1b2 100644 --- a/zabbix/web/Dockerfile +++ b/zabbix/web/Dockerfile @@ -3,12 +3,15 @@ ENV DEBIAN_FRONTEND noninteractive USER root -#editing sources list +################################################################## +# editing sources list +################################################################## COPY sources.list /etc/apt/sources.list COPY locale.gen /etc/locale.gen - -# installing additional apps +################################################################## +# installing utils +################################################################## RUN apt update -y && \ apt install -y --allow-unauthenticated \ ca-certificates \