From aa45203d24eef93ad63f069798867bbc0ac17076 Mon Sep 17 00:00:00 2001 From: STAM Date: Fri, 2 Apr 2021 14:40:42 +0300 Subject: [PATCH] fixes --- .github/workflows/docker-linux-master.yml | 63 +++++++++++++++-------- linux/apache2/latest/Makefile | 4 +- linux/apache2/php7.2/Makefile | 4 +- linux/apache2/php7.3/Makefile | 3 ++ linux/apache2/php7.4/Makefile | 5 +- linux/nginx/latest/Makefile | 4 +- linux/nginx/php/Makefile | 4 +- linux/nginx/rtmp-hls/Makefile | 4 +- linux/testrail/latest/Dockerfile | 1 - 9 files changed, 64 insertions(+), 28 deletions(-) diff --git a/.github/workflows/docker-linux-master.yml b/.github/workflows/docker-linux-master.yml index 0638a0d7c..139679a40 100644 --- a/.github/workflows/docker-linux-master.yml +++ b/.github/workflows/docker-linux-master.yml @@ -227,15 +227,21 @@ jobs: run: docker build --compress -t epicmorg/apache2:latest linux/apache2/latest - name: Push Apache (latest) run: docker push epicmorg/apache2:latest - - name: Push Apache:websites (latest) - run: docker push epicmorg/websites:latest - - - name: Build NGinx (latest) + + - name: Retag and Push Apache (legacy) + run: | + docker tag epicmorg/apache2:latest epicmorg/websites:latest + docker push epicmorg/websites:latest + + - name: Build Nginx (latest) run: docker build --compress -t epicmorg/nginx:latest linux/nginx/latest - - name: Push NGinx (latest) + - name: Push Nginx (latest) run: docker push epicmorg/nginx:latest - - name: Push NGinx:balancer (latest) - run: docker push epicmorg/balancer:latest + + - name: Retag and Push Nginx (legacy) + run: | + docker tag epicmorg/nginx:latest epicmorg/balancer:latest + docker push epicmorg/balancer:latest - name: Build TeamCity Agent run: docker build --compress -t epicmorg/teamcity-agent:latest linux/teamcity/agent @@ -295,19 +301,25 @@ jobs: ################################################################################## - - name: Build NGinx + PHP7.4 + - name: Build Nginx + PHP7.4 run: docker build --compress -t epicmorg/nginx:php linux/nginx/php - - name: Push NGinx + PHP7.4 + - name: Push Nginx + PHP7.4 run: docker push epicmorg/nginx:php - - name: Push NGinx:balancer + PHP7.4 - run: docker push epicmorg/balancer:php - - name: Build NGinx + RTMP-HLS + - name: Retag and Push Nginx + PHP7.4 (legacy) + run: | + docker tag epicmorg/nginx:php epicmorg/balancer:php + docker push epicmorg/balancer:php + + - name: Build Nginx + RTMP-HLS run: docker build --compress -t epicmorg/nginx:rtmp-hls linux/nginx/rtmp-hls - - name: Push NGinx + RTMP-HLS + - name: Push Nginx + RTMP-HLS run: docker push epicmorg/nginx:rtmp-hls - - name: Push NGinx:balancer + RTMP-HLS - run: docker push epicmorg/balancer:rtmp-hls + + - name: Retag and Push Nginx + RTMP-HLS (legacy) + run: | + docker tag epicmorg/apache2:latest epicmorg/websites:latest + docker push epicmorg/websites:latest - name: PHP 7.4 run: docker build --compress -t epicmorg/php:php7.4 linux/php/php7.4 @@ -331,22 +343,31 @@ jobs: run: docker build --compress -t epicmorg/apache2:php7.4 linux/apache2/php7.4 - name: Push Apache + PHP7.4 run: docker push epicmorg/apache2:php7.4 - - name: Push Apache:websites + PHP7.4 - run: docker push epicmorg/websites:php7.4 + + - name: Retag and Push Apache + PHP7.4 (legacy) + run: | + docker tag epicmorg/apache2:php7.4 epicmorg/websites:php7.4 + docker push epicmorg/websites:php7.4 - name: Build Apache + PHP7.3 run: docker build --compress -t epicmorg/apache2:php7.3 linux/apache2/php7.3 - name: Push Apache + PHP7.3 run: docker push epicmorg/apache2:php7.3 - - name: Push Apache:websites + PHP7.3 - run: docker push epicmorg/websites:php7.3 + + - name: Retag and Push Apache + PHP7.3 (legacy) + run: | + docker tag epicmorg/apache2:php7.3 epicmorg/websites:php7.3 + docker push epicmorg/websites:php7.3 - name: Build Apache + PHP7.2 run: docker build --compress -t epicmorg/apache2:php7.2 linux/apache2/php7.2 - name: Push Apache + PHP7.2 run: docker push epicmorg/apache2:php7.2 - - name: Push Apache:websites + PHP7.2 - run: docker push epicmorg/websites:php7.2 + + - name: Retag and Push Apache + PHP7.2 (legacy) + run: | + docker tag epicmorg/apache2:php7.2 epicmorg/websites:php7.2 + docker push epicmorg/websites:php7.2 - name: Cleanup run: docker system prune --all --force --volumes diff --git a/linux/apache2/latest/Makefile b/linux/apache2/latest/Makefile index 508d4cc37..5807f7dc3 100644 --- a/linux/apache2/latest/Makefile +++ b/linux/apache2/latest/Makefile @@ -2,4 +2,6 @@ all: apache2 apache2: docker build --compress -t epicmorg/apache2:latest . docker push epicmorg/apache2:latest - docker push epicmorg/websites:latest + + docker tag epicmorg/apache2:latest epicmorg/websites:latest + docker push epicmorg/websites:latest \ No newline at end of file diff --git a/linux/apache2/php7.2/Makefile b/linux/apache2/php7.2/Makefile index 6b4390392..e10f24c18 100644 --- a/linux/apache2/php7.2/Makefile +++ b/linux/apache2/php7.2/Makefile @@ -2,4 +2,6 @@ all: apache2 apache2: docker build --compress -t epicmorg/apache2:php7.2 . docker push epicmorg/apache2:php7.2 - docker push epicmorg/websites:php7.2 + + docker tag epicmorg/apache2:php7.2 epicmorg/websites:php7.2 + docker push epicmorg/websites:php7.2 \ No newline at end of file diff --git a/linux/apache2/php7.3/Makefile b/linux/apache2/php7.3/Makefile index af7d3d660..39f4fc5a9 100644 --- a/linux/apache2/php7.3/Makefile +++ b/linux/apache2/php7.3/Makefile @@ -2,4 +2,7 @@ all: apache2 apache2: docker build --compress -t epicmorg/apache2:php7.3 . docker push epicmorg/apache2:php7.3 + + docker tag epicmorg/apache2:php7.3 epicmorg/websites:php7.3 docker push epicmorg/websites:php7.3 + diff --git a/linux/apache2/php7.4/Makefile b/linux/apache2/php7.4/Makefile index febb205fa..810c88cf6 100644 --- a/linux/apache2/php7.4/Makefile +++ b/linux/apache2/php7.4/Makefile @@ -2,4 +2,7 @@ all: apache2 apache2: docker build --compress -t epicmorg/apache2:php7.4 . docker push epicmorg/apache2:php7.4 - docker push epicmorg/websites:php7.4 + + docker tag epicmorg/apache2:php7.4 epicmorg/websites:php7.4 + docker push epicmorg/websites:php7.4 + diff --git a/linux/nginx/latest/Makefile b/linux/nginx/latest/Makefile index 363a3a882..f2a6e0a32 100644 --- a/linux/nginx/latest/Makefile +++ b/linux/nginx/latest/Makefile @@ -3,4 +3,6 @@ all: nginx nginx: docker build --compress -t epicmorg/nginx:latest . docker push epicmorg/nginx:latest - docker push epicmorg/balancer:latest \ No newline at end of file + + docker tag epicmorg/nginx:latest epicmorg/balancer:latest + docker push epicmorg/balancer:latest diff --git a/linux/nginx/php/Makefile b/linux/nginx/php/Makefile index ef9dc1027..ebf972813 100644 --- a/linux/nginx/php/Makefile +++ b/linux/nginx/php/Makefile @@ -3,4 +3,6 @@ all: nginx nginx: docker build --compress -t epicmorg/nginx:php . docker push epicmorg/nginx:php - docker push epicmorg/balancer:php \ No newline at end of file + + docker tag epicmorg/nginx:php epicmorg/balancer:php + docker push epicmorg/balancer:php diff --git a/linux/nginx/rtmp-hls/Makefile b/linux/nginx/rtmp-hls/Makefile index 1801aab97..6a0ebdef8 100644 --- a/linux/nginx/rtmp-hls/Makefile +++ b/linux/nginx/rtmp-hls/Makefile @@ -3,4 +3,6 @@ all: nginx nginx: docker build --compress -t epicmorg/nginx:rtmp-hls . docker push epicmorg/nginx:rtmp-hls - docker push epicmorg/balancer:rtmp-hls \ No newline at end of file + + docker tag epicmorg/nginx:rtmp-hls epicmorg/balancer:rtmp-hls + docker push epicmorg/balancer:rtmp-hls diff --git a/linux/testrail/latest/Dockerfile b/linux/testrail/latest/Dockerfile index 18800a1af..333409e38 100644 --- a/linux/testrail/latest/Dockerfile +++ b/linux/testrail/latest/Dockerfile @@ -14,7 +14,6 @@ ENV OPENSSL_CONF=/etc/ssl/ RUN \ apt-get update && \ - apt-get install -y --no-install-recommends curl zip unzip wget iputils-ping mariadb-client openssl && \ apt-get install -y --no-install-recommends zlib1g-dev libcurl4-gnutls-dev libldap2-dev zlib1g-dev libxml2-dev libfontconfig1 && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \