From 50fb5d67468c276de7de4c8a36b11e38b5b06037 Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 17 Oct 2022 12:30:31 +0300 Subject: [PATCH] fixes --- .../workflows/epicmorg.base.images.testrail.yml | 2 +- .github/workflows/epicmorg.base.images.web.yml | 16 ++++++++-------- .../debian/08-jessie/slim/etc/apt/sources.list | 4 ++-- linux/ecosystem/nodejs/node11/Dockerfile | 2 +- linux/ecosystem/postgres/16/Dockerfile | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/epicmorg.base.images.testrail.yml b/.github/workflows/epicmorg.base.images.testrail.yml index ca533571c..2fd4b948a 100644 --- a/.github/workflows/epicmorg.base.images.testrail.yml +++ b/.github/workflows/epicmorg.base.images.testrail.yml @@ -1,4 +1,4 @@ -name: EpicMorg EcoSystem Web Images +name: EpicMorg EcoSystem Testrail Images on: # push: diff --git a/.github/workflows/epicmorg.base.images.web.yml b/.github/workflows/epicmorg.base.images.web.yml index e44f896d3..28f3a733e 100644 --- a/.github/workflows/epicmorg.base.images.web.yml +++ b/.github/workflows/epicmorg.base.images.web.yml @@ -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 ################################################################################## diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/sources.list b/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/sources.list index 9bd78f7f6..49c3c439d 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/debian/08-jessie/slim/etc/apt/sources.list @@ -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 diff --git a/linux/ecosystem/nodejs/node11/Dockerfile b/linux/ecosystem/nodejs/node11/Dockerfile index 6a7f409d9..c5d004aa2 100644 --- a/linux/ecosystem/nodejs/node11/Dockerfile +++ b/linux/ecosystem/nodejs/node11/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/debian:bullseye +FROM epicmorg/debian:buster LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/postgres/16/Dockerfile b/linux/ecosystem/postgres/16/Dockerfile index de7799ad7..506712364 100644 --- a/linux/ecosystem/postgres/16/Dockerfile +++ b/linux/ecosystem/postgres/16/Dockerfile @@ -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 \