From f05e57c7353656c1d81fc74622fac8624d1dd8e6 Mon Sep 17 00:00:00 2001 From: STAM Date: Thu, 1 Apr 2021 13:39:49 +0300 Subject: [PATCH] balancer -> nginx renamed in warkflows --- .github/workflows/docker-linux-develop.yml | 6 +++--- .github/workflows/docker-linux-master.yml | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-linux-develop.yml b/.github/workflows/docker-linux-develop.yml index 42accc560..a404a8e23 100644 --- a/.github/workflows/docker-linux-develop.yml +++ b/.github/workflows/docker-linux-develop.yml @@ -160,13 +160,13 @@ jobs: run: docker build --compress -t epicmorg/teamcity-agent:latest linux/teamcity/agent - name: Build NGinx (latest) - run: docker build --compress -t epicmorg/balancer:latest linux/balancer/latest + run: docker build --compress -t epicmorg/nginx:latest linux/nginx/latest - name: Build NGinx + PHP7.4 - run: docker build --compress -t epicmorg/balancer:php linux/balancer/php + run: docker build --compress -t epicmorg/nginx:php linux/nginx/php - name: Build NGinx + RTMP-HLS - run: docker build --compress -t epicmorg/balancer:rtmp-hls linux/balancer/rtmp-hls + run: docker build --compress -t epicmorg/nginx:rtmp-hls linux/nginx/rtmp-hls - name: Cleanup run: docker system prune --all --force --volumes diff --git a/.github/workflows/docker-linux-master.yml b/.github/workflows/docker-linux-master.yml index b820c0ade..07db9706e 100644 --- a/.github/workflows/docker-linux-master.yml +++ b/.github/workflows/docker-linux-master.yml @@ -229,8 +229,10 @@ jobs: run: docker push epicmorg/websites:latest - name: Build NGinx (latest) - run: docker build --compress -t epicmorg/balancer:latest linux/balancer/latest + run: docker build --compress -t epicmorg/nginx:latest linux/nginx/latest - name: Push NGinx (latest) + run: docker push epicmorg/nginx:latest + - name: Push NGinx:balancer (latest) run: docker push epicmorg/balancer:latest - name: Build TeamCity Agent @@ -292,13 +294,17 @@ jobs: ################################################################################## - name: Build NGinx + PHP7.4 - run: docker build --compress -t epicmorg/balancer:php linux/balancer/php + run: docker build --compress -t epicmorg/nginx:php linux/nginx/php - 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 - run: docker build --compress -t epicmorg/balancer:rtmp-hls linux/balancer/rtmp-hls + run: docker build --compress -t epicmorg/nginx:rtmp-hls linux/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: PHP 7.4