Merge branch 'develop'

This commit is contained in:
STAM 2022-10-17 12:30:39 +03:00
commit 5f64e9efd6
Signed by: stam
GPG Key ID: E149C3760CFA3C7E
5 changed files with 15 additions and 15 deletions

View File

@ -1,4 +1,4 @@
name: EpicMorg EcoSystem Web Images
name: EpicMorg EcoSystem Testrail Images
on:
# push:

View File

@ -25,16 +25,16 @@ jobs:
run: cd linux/ecosystem/php/latest && pwd && make build && make deploy
- name: "Build and Deploy PHP 7.2 Image:"
run: cd linux/ecosystem/php/7.2 && pwd && make build && make deploy
run: cd linux/ecosystem/php/php7.2 && pwd && make build && make deploy
- name: "Build and Deploy PHP 7.3 Image:"
run: cd linux/ecosystem/php/7.3 && pwd && make build && make deploy
run: cd linux/ecosystem/php/php7.3 && pwd && make build && make deploy
- name: "Build and Deploy PHP 7.4 Image:"
run: cd linux/ecosystem/php/7.4 && pwd && make build && make deploy
run: cd linux/ecosystem/php/php7.4 && pwd && make build && make deploy
- name: "Build and Deploy PHP 8.0 Image:"
run: cd linux/ecosystem/php/8.0 && pwd && make build && make deploy
run: cd linux/ecosystem/php/php8.0 && pwd && make build && make deploy
##################################################################################
@ -55,16 +55,16 @@ jobs:
run: cd linux/ecosystem/apache2/latest && pwd && make build && make deploy
- name: "Build and Deploy Apache 2 + PHP 7.2 Image:"
run: cd linux/ecosystem/apache2/7.2 && pwd && make build && make deploy
run: cd linux/ecosystem/apache2/php7.2 && pwd && make build && make deploy
- name: "Build and Deploy Apache 2 + PHP 7.3 Image:"
run: cd linux/ecosystem/apache2/7.3 && pwd && make build && make deploy
run: cd linux/ecosystem/apache2/php7.3 && pwd && make build && make deploy
- name: "Build and Deploy Apache 2 + PHP 7.4 Image:"
run: cd linux/ecosystem/apache2/7.4 && pwd && make build && make deploy
run: cd linux/ecosystem/apache2/php7.4 && pwd && make build && make deploy
- name: "Build and Deploy Apache 2 + PHP 8.0 Image:"
run: cd linux/ecosystem/apache2/8.0 && pwd && make build && make deploy
run: cd linux/ecosystem/apache2/php8.0 && pwd && make build && make deploy
##################################################################################

View File

@ -2,8 +2,8 @@
deb http://archive.debian.org/debian/ jessie main contrib non-free
deb-src http://archive.debian.org/debian/ jessie main contrib non-free
deb http://archive.debian.org/debian/ jessie-kfreebsd main contrib non-free
deb-src http://archive.debian.org/debian/ jessie-kfreebsd main contrib non-free
#deb http://archive.debian.org/debian/ jessie-kfreebsd main contrib non-free
#deb-src http://archive.debian.org/debian/ jessie-kfreebsd main contrib non-free
deb http://archive.debian.org/debian/ jessie-backports main contrib non-free
deb-src http://archive.debian.org/debian/ jessie-backports main contrib non-free

View File

@ -1,4 +1,4 @@
FROM epicmorg/debian:bullseye
FROM epicmorg/debian:buster
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive

View File

@ -1,4 +1,4 @@
FROM epicmorg/debian:bullseye
FROM epicmorg/debian:bookworm
LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
ARG DEBIAN_FRONTEND=noninteractive
@ -33,8 +33,8 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys B97B0AFCAA1A47F044F
####################################################################################################################################
ENV PG_MAJOR 16
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list && \
echo 'deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg-testing main' $PG_MAJOR >> /etc/apt/sources.list.d/pgdg.list
RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list && \
echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg-testing main' $PG_MAJOR >> /etc/apt/sources.list.d/pgdg.list
RUN apt-get update \
&& apt-get install -y postgresql-common \