From dedb38970594dcf588aab8d3328c19281fcb29cc Mon Sep 17 00:00:00 2001 From: STAM Date: Sun, 16 Oct 2022 14:35:24 +0300 Subject: [PATCH 1/3] fixes --- .github/workflows/epicmorg.advanced.images.yml | 2 +- .../epicmorg.advanced.nextcloud.images.yml | 4 ++-- .../epicmorg.advanced.vscode.images.yml | 2 +- .../epicmorg.advanced.zabbix.images.yml | 16 ++++++++-------- .../epicmorg.base.images.current.atlassian.yml | 2 +- .../epicmorg.base.images.current.debian10.yml | 2 +- .../epicmorg.base.images.current.debian11.yml | 2 +- .../epicmorg.base.images.current.debian12.yml | 2 +- .../workflows/epicmorg.base.images.legacy.yml | 8 ++++---- .../workflows/epicmorg.base.images.nodejs.yml | 2 +- .../epicmorg.base.images.perforce.yml | 4 ++-- .../epicmorg.base.images.postgresql.yml | 2 +- .../workflows/epicmorg.base.images.python.yml | 4 ++-- .../epicmorg.base.images.teamcity.agents.yml | 4 ++-- .../epicmorg.base.images.testrail.yml | 6 +++--- .github/workflows/epicmorg.base.images.web.yml | 6 +++--- .../epicmorg.ecosysctem.misc.images.yml | 18 +++++++++--------- LICENSE.md | 2 +- linux/ecosystem/nginx/1.14.2/main/Dockerfile | 2 +- linux/ecosystem/nginx/1.14.2/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.15.12/main/Dockerfile | 2 +- linux/ecosystem/nginx/1.15.12/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.16.1/main/Dockerfile | 2 +- linux/ecosystem/nginx/1.16.1/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.17.10/main/Dockerfile | 2 +- linux/ecosystem/nginx/1.17.10/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.18.0/main/Dockerfile | 2 +- linux/ecosystem/nginx/1.18.0/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.19.10/main/Dockerfile | 2 +- linux/ecosystem/nginx/1.19.10/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.20.1/main/Dockerfile | 2 +- linux/ecosystem/nginx/1.20.1/php/Dockerfile | 2 +- linux/ecosystem/nginx/1.21.3/main/Dockerfile | 2 +- linux/ecosystem/nginx/1.21.3/php/Dockerfile | 2 +- linux/ecosystem/nginx/latest/main/Dockerfile | 2 +- linux/ecosystem/nginx/latest/php/Dockerfile | 2 +- linux/ecosystem/php/latest/Dockerfile | 2 +- linux/ecosystem/php/php7.2/Dockerfile | 2 +- linux/ecosystem/php/php7.3/Dockerfile | 2 +- linux/ecosystem/php/php7.4/Dockerfile | 2 +- linux/ecosystem/php/php8.0/Dockerfile | 2 +- .../php/php8.1-p4-not-ready/Dockerfile | 2 +- 42 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.github/workflows/epicmorg.advanced.images.yml b/.github/workflows/epicmorg.advanced.images.yml index 80c189856..18870aae2 100644 --- a/.github/workflows/epicmorg.advanced.images.yml +++ b/.github/workflows/epicmorg.advanced.images.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.advanced.nextcloud.images.yml b/.github/workflows/epicmorg.advanced.nextcloud.images.yml index a6fb75ce1..effdbc807 100644 --- a/.github/workflows/epicmorg.advanced.nextcloud.images.yml +++ b/.github/workflows/epicmorg.advanced.nextcloud.images.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -64,7 +64,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.advanced.vscode.images.yml b/.github/workflows/epicmorg.advanced.vscode.images.yml index abf381348..5fc7fe0d5 100644 --- a/.github/workflows/epicmorg.advanced.vscode.images.yml +++ b/.github/workflows/epicmorg.advanced.vscode.images.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.advanced.zabbix.images.yml b/.github/workflows/epicmorg.advanced.zabbix.images.yml index 0dae4e3c2..cc7c19fa3 100644 --- a/.github/workflows/epicmorg.advanced.zabbix.images.yml +++ b/.github/workflows/epicmorg.advanced.zabbix.images.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -58,7 +58,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -99,7 +99,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -140,7 +140,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -184,7 +184,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -228,7 +228,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -272,7 +272,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -316,7 +316,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.current.atlassian.yml b/.github/workflows/epicmorg.base.images.current.atlassian.yml index 44514a2b6..5e12e2c63 100644 --- a/.github/workflows/epicmorg.base.images.current.atlassian.yml +++ b/.github/workflows/epicmorg.base.images.current.atlassian.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.current.debian10.yml b/.github/workflows/epicmorg.base.images.current.debian10.yml index d3e1059a2..a2d39c08e 100644 --- a/.github/workflows/epicmorg.base.images.current.debian10.yml +++ b/.github/workflows/epicmorg.base.images.current.debian10.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.current.debian11.yml b/.github/workflows/epicmorg.base.images.current.debian11.yml index 6773e7bc6..fbb8b6b83 100644 --- a/.github/workflows/epicmorg.base.images.current.debian11.yml +++ b/.github/workflows/epicmorg.base.images.current.debian11.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.current.debian12.yml b/.github/workflows/epicmorg.base.images.current.debian12.yml index b224b531b..ae9f9454e 100644 --- a/.github/workflows/epicmorg.base.images.current.debian12.yml +++ b/.github/workflows/epicmorg.base.images.current.debian12.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.legacy.yml b/.github/workflows/epicmorg.base.images.legacy.yml index f23fe4fd0..4c6d1ad69 100644 --- a/.github/workflows/epicmorg.base.images.legacy.yml +++ b/.github/workflows/epicmorg.base.images.legacy.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -60,7 +60,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -119,7 +119,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.nodejs.yml b/.github/workflows/epicmorg.base.images.nodejs.yml index 59be90193..eab29a8f8 100644 --- a/.github/workflows/epicmorg.base.images.nodejs.yml +++ b/.github/workflows/epicmorg.base.images.nodejs.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.perforce.yml b/.github/workflows/epicmorg.base.images.perforce.yml index d78a38663..cff3a9e0a 100644 --- a/.github/workflows/epicmorg.base.images.perforce.yml +++ b/.github/workflows/epicmorg.base.images.perforce.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -65,7 +65,7 @@ jobs: needs: build-p4-images steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.postgresql.yml b/.github/workflows/epicmorg.base.images.postgresql.yml index 5be693069..a7eba38d9 100644 --- a/.github/workflows/epicmorg.base.images.postgresql.yml +++ b/.github/workflows/epicmorg.base.images.postgresql.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.python.yml b/.github/workflows/epicmorg.base.images.python.yml index d28b4a672..f5d2d5fe5 100644 --- a/.github/workflows/epicmorg.base.images.python.yml +++ b/.github/workflows/epicmorg.base.images.python.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -50,7 +50,7 @@ jobs: needs: build-python-base-images steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.teamcity.agents.yml b/.github/workflows/epicmorg.base.images.teamcity.agents.yml index 072c1ddb5..9778d47ab 100644 --- a/.github/workflows/epicmorg.base.images.teamcity.agents.yml +++ b/.github/workflows/epicmorg.base.images.teamcity.agents.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -32,7 +32,7 @@ jobs: needs: build-tca-main-images steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.testrail.yml b/.github/workflows/epicmorg.base.images.testrail.yml index 699391c43..ca533571c 100644 --- a/.github/workflows/epicmorg.base.images.testrail.yml +++ b/.github/workflows/epicmorg.base.images.testrail.yml @@ -15,7 +15,7 @@ jobs: # needs: build-php-images steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -42,7 +42,7 @@ jobs: # needs: build-php-images steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -66,7 +66,7 @@ jobs: # needs: build-php-images steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.base.images.web.yml b/.github/workflows/epicmorg.base.images.web.yml index c893f42d4..e44f896d3 100644 --- a/.github/workflows/epicmorg.base.images.web.yml +++ b/.github/workflows/epicmorg.base.images.web.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -44,7 +44,7 @@ jobs: needs: build-php-images steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -74,7 +74,7 @@ jobs: needs: build-php-images steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/.github/workflows/epicmorg.ecosysctem.misc.images.yml b/.github/workflows/epicmorg.ecosysctem.misc.images.yml index f89935871..1d52ca82f 100644 --- a/.github/workflows/epicmorg.ecosysctem.misc.images.yml +++ b/.github/workflows/epicmorg.ecosysctem.misc.images.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -48,7 +48,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -82,7 +82,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -99,7 +99,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -116,7 +116,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -133,7 +133,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin @@ -150,7 +150,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout + - uses: actions/checkout@v3 - name: Log into registry run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin diff --git a/LICENSE.md b/LICENSE.md index ba51b1820..7312821e6 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2023 EpicMorg: Main +Copyright (c) 2009 EpicMorg Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/linux/ecosystem/nginx/1.14.2/main/Dockerfile b/linux/ecosystem/nginx/1.14.2/main/Dockerfile index f67d634e3..5767346aa 100644 --- a/linux/ecosystem/nginx/1.14.2/main/Dockerfile +++ b/linux/ecosystem/nginx/1.14.2/main/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.14.2/php/Dockerfile b/linux/ecosystem/nginx/1.14.2/php/Dockerfile index c0f6308c2..3d928b4a0 100644 --- a/linux/ecosystem/nginx/1.14.2/php/Dockerfile +++ b/linux/ecosystem/nginx/1.14.2/php/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.15.12/main/Dockerfile b/linux/ecosystem/nginx/1.15.12/main/Dockerfile index f67d634e3..5767346aa 100644 --- a/linux/ecosystem/nginx/1.15.12/main/Dockerfile +++ b/linux/ecosystem/nginx/1.15.12/main/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.15.12/php/Dockerfile b/linux/ecosystem/nginx/1.15.12/php/Dockerfile index c0f6308c2..3d928b4a0 100644 --- a/linux/ecosystem/nginx/1.15.12/php/Dockerfile +++ b/linux/ecosystem/nginx/1.15.12/php/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.16.1/main/Dockerfile b/linux/ecosystem/nginx/1.16.1/main/Dockerfile index f67d634e3..5767346aa 100644 --- a/linux/ecosystem/nginx/1.16.1/main/Dockerfile +++ b/linux/ecosystem/nginx/1.16.1/main/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.16.1/php/Dockerfile b/linux/ecosystem/nginx/1.16.1/php/Dockerfile index c0f6308c2..3d928b4a0 100644 --- a/linux/ecosystem/nginx/1.16.1/php/Dockerfile +++ b/linux/ecosystem/nginx/1.16.1/php/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.17.10/main/Dockerfile b/linux/ecosystem/nginx/1.17.10/main/Dockerfile index f67d634e3..5767346aa 100644 --- a/linux/ecosystem/nginx/1.17.10/main/Dockerfile +++ b/linux/ecosystem/nginx/1.17.10/main/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.17.10/php/Dockerfile b/linux/ecosystem/nginx/1.17.10/php/Dockerfile index c0f6308c2..3d928b4a0 100644 --- a/linux/ecosystem/nginx/1.17.10/php/Dockerfile +++ b/linux/ecosystem/nginx/1.17.10/php/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.18.0/main/Dockerfile b/linux/ecosystem/nginx/1.18.0/main/Dockerfile index f67d634e3..5767346aa 100644 --- a/linux/ecosystem/nginx/1.18.0/main/Dockerfile +++ b/linux/ecosystem/nginx/1.18.0/main/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.18.0/php/Dockerfile b/linux/ecosystem/nginx/1.18.0/php/Dockerfile index c0f6308c2..3d928b4a0 100644 --- a/linux/ecosystem/nginx/1.18.0/php/Dockerfile +++ b/linux/ecosystem/nginx/1.18.0/php/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.19.10/main/Dockerfile b/linux/ecosystem/nginx/1.19.10/main/Dockerfile index f67d634e3..5767346aa 100644 --- a/linux/ecosystem/nginx/1.19.10/main/Dockerfile +++ b/linux/ecosystem/nginx/1.19.10/main/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.19.10/php/Dockerfile b/linux/ecosystem/nginx/1.19.10/php/Dockerfile index c0f6308c2..3d928b4a0 100644 --- a/linux/ecosystem/nginx/1.19.10/php/Dockerfile +++ b/linux/ecosystem/nginx/1.19.10/php/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.20.1/main/Dockerfile b/linux/ecosystem/nginx/1.20.1/main/Dockerfile index f67d634e3..5767346aa 100644 --- a/linux/ecosystem/nginx/1.20.1/main/Dockerfile +++ b/linux/ecosystem/nginx/1.20.1/main/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.20.1/php/Dockerfile b/linux/ecosystem/nginx/1.20.1/php/Dockerfile index c0f6308c2..3d928b4a0 100644 --- a/linux/ecosystem/nginx/1.20.1/php/Dockerfile +++ b/linux/ecosystem/nginx/1.20.1/php/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.21.3/main/Dockerfile b/linux/ecosystem/nginx/1.21.3/main/Dockerfile index 76a3686e6..00b9a25a6 100644 --- a/linux/ecosystem/nginx/1.21.3/main/Dockerfile +++ b/linux/ecosystem/nginx/1.21.3/main/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/1.21.3/php/Dockerfile b/linux/ecosystem/nginx/1.21.3/php/Dockerfile index c0f6308c2..3d928b4a0 100644 --- a/linux/ecosystem/nginx/1.21.3/php/Dockerfile +++ b/linux/ecosystem/nginx/1.21.3/php/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/latest/main/Dockerfile b/linux/ecosystem/nginx/latest/main/Dockerfile index 3129bade0..9bef2f4a0 100644 --- a/linux/ecosystem/nginx/latest/main/Dockerfile +++ b/linux/ecosystem/nginx/latest/main/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nginx/latest/php/Dockerfile b/linux/ecosystem/nginx/latest/php/Dockerfile index 319aa550c..ad66b5222 100644 --- a/linux/ecosystem/nginx/latest/php/Dockerfile +++ b/linux/ecosystem/nginx/latest/php/Dockerfile @@ -6,7 +6,7 @@ ARG NGINX_VERSION ################################################################## # Start build process ################################################################## -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/php/latest/Dockerfile b/linux/ecosystem/php/latest/Dockerfile index d0784bb57..a26418e74 100644 --- a/linux/ecosystem/php/latest/Dockerfile +++ b/linux/ecosystem/php/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/php/php7.2/Dockerfile b/linux/ecosystem/php/php7.2/Dockerfile index b3b527444..09a10a983 100644 --- a/linux/ecosystem/php/php7.2/Dockerfile +++ b/linux/ecosystem/php/php7.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/php/php7.3/Dockerfile b/linux/ecosystem/php/php7.3/Dockerfile index 1a0157990..5fdff2a18 100644 --- a/linux/ecosystem/php/php7.3/Dockerfile +++ b/linux/ecosystem/php/php7.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/php/php7.4/Dockerfile b/linux/ecosystem/php/php7.4/Dockerfile index d0784bb57..a26418e74 100644 --- a/linux/ecosystem/php/php7.4/Dockerfile +++ b/linux/ecosystem/php/php7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/php/php8.0/Dockerfile b/linux/ecosystem/php/php8.0/Dockerfile index 8c22d9e47..d41e122e0 100644 --- a/linux/ecosystem/php/php8.0/Dockerfile +++ b/linux/ecosystem/php/php8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile b/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile index ad3e89dbd..0df911310 100644 --- a/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile +++ b/linux/ecosystem/php/php8.1-p4-not-ready/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive From c9b2c72daa6d7cca1b7f483b85ad797ef96403fa Mon Sep 17 00:00:00 2001 From: STAM Date: Sun, 16 Oct 2022 14:42:09 +0300 Subject: [PATCH 2/3] fixes --- linux/ecosystem/nodejs/node10/Dockerfile | 2 +- linux/ecosystem/nodejs/node11/Dockerfile | 2 +- linux/ecosystem/nodejs/node13/Dockerfile | 2 +- linux/ecosystem/php/php7.2/Dockerfile | 2 +- linux/ecosystem/php/php7.3/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/ecosystem/nodejs/node10/Dockerfile b/linux/ecosystem/nodejs/node10/Dockerfile index 94ba21d28..ed6c6e3de 100644 --- a/linux/ecosystem/nodejs/node10/Dockerfile +++ b/linux/ecosystem/nodejs/node10/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod:latest +FROM epicmorg/debian:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nodejs/node11/Dockerfile b/linux/ecosystem/nodejs/node11/Dockerfile index 06bc17d3f..6a7f409d9 100644 --- a/linux/ecosystem/nodejs/node11/Dockerfile +++ b/linux/ecosystem/nodejs/node11/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod:latest +FROM epicmorg/debian:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/nodejs/node13/Dockerfile b/linux/ecosystem/nodejs/node13/Dockerfile index 1ce352717..1cb266405 100644 --- a/linux/ecosystem/nodejs/node13/Dockerfile +++ b/linux/ecosystem/nodejs/node13/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod:latest +FROM epicmorg/debian:buster LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/php/php7.2/Dockerfile b/linux/ecosystem/php/php7.2/Dockerfile index 09a10a983..f64d70d56 100644 --- a/linux/ecosystem/php/php7.2/Dockerfile +++ b/linux/ecosystem/php/php7.2/Dockerfile @@ -77,7 +77,7 @@ RUN cd ${MAKE_DIR} && \ ################################################################## ################################################################## -FROM epicmorg/prod +FROM epicmorg/debian:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/php/php7.3/Dockerfile b/linux/ecosystem/php/php7.3/Dockerfile index 5fdff2a18..f026656f5 100644 --- a/linux/ecosystem/php/php7.3/Dockerfile +++ b/linux/ecosystem/php/php7.3/Dockerfile @@ -76,7 +76,7 @@ RUN cd ${MAKE_DIR} && \ ################################################################## ################################################################## -FROM epicmorg/prod +FROM epicmorg/debian:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive From c51d57b827a6acef8e7855c1c28aaa81eb627e09 Mon Sep 17 00:00:00 2001 From: Zimovskii Anatolii Date: Sun, 16 Oct 2022 15:24:48 +0300 Subject: [PATCH 3/3] make - autocommit --- linux/ecosystem/cassandra/3.11/Dockerfile | 2 +- linux/ecosystem/php/php7.3/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/ecosystem/cassandra/3.11/Dockerfile b/linux/ecosystem/cassandra/3.11/Dockerfile index ae4d529fc..d6cc4a29b 100644 --- a/linux/ecosystem/cassandra/3.11/Dockerfile +++ b/linux/ecosystem/cassandra/3.11/Dockerfile @@ -6,6 +6,6 @@ ARG CAS_LUCENE_PLUGIN_VER=3.11.3.0 ARG CAS_LUCENE_PLUGIN_URL=https://repo1.maven.org/maven2/com/stratio/cassandra/cassandra-lucene-index-plugin/${CAS_LUCENE_PLUGIN_VER}/cassandra-lucene-index-plugin-${CAS_LUCENE_PLUGIN_VER}.jar RUN cd /opt/bitnami/cassandra/lib && \ - curl ${CAS_LUCENE_PLUGIN_URL} + curl ${CAS_LUCENE_PLUGIN_URL} --output cassandra-lucene-index-plugin-${CAS_LUCENE_PLUGIN_VER}.jar USER 1001 diff --git a/linux/ecosystem/php/php7.3/Dockerfile b/linux/ecosystem/php/php7.3/Dockerfile index f026656f5..6f2378fb7 100644 --- a/linux/ecosystem/php/php7.3/Dockerfile +++ b/linux/ecosystem/php/php7.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/debian:bullseye-develop AS builder +FROM epicmorg/debian:buster-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -76,7 +76,7 @@ RUN cd ${MAKE_DIR} && \ ################################################################## ################################################################## -FROM epicmorg/debian:bullseye +FROM epicmorg/debian:buster LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive