From f1b178ea7ce4d51d5af625360ae2abbebe9aeef9 Mon Sep 17 00:00:00 2001 From: STAM Date: Thu, 1 Apr 2021 13:45:39 +0300 Subject: [PATCH] websites -> apache2 in wf --- .github/workflows/docker-linux-develop.yml | 8 ++++---- .github/workflows/docker-linux-master.yml | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-linux-develop.yml b/.github/workflows/docker-linux-develop.yml index a404a8e23..a412dd790 100644 --- a/.github/workflows/docker-linux-develop.yml +++ b/.github/workflows/docker-linux-develop.yml @@ -187,16 +187,16 @@ jobs: run: docker system prune --all --force --volumes - name: Build Apache (latest) - run: docker build --compress -t epicmorg/websites:latest linux/websites/latest + run: docker build --compress -t epicmorg/apache2:latest linux/apache2/latest - name: Build Apache + PHP7.4 - run: docker build --compress -t epicmorg/websites:php7.4 linux/websites/php7.4 + run: docker build --compress -t epicmorg/apache2:php7.4 linux/apache2/php7.4 - name: Build Apache + PHP7.3 - run: docker build --compress -t epicmorg/websites:php7.3 linux/websites/php7.3 + run: docker build --compress -t epicmorg/apache2:php7.3 linux/apache2/php7.3 - name: Build Apache + PHP7.2 - run: docker build --compress -t epicmorg/websites:php7.2 linux/websites/php7.2 + run: docker build --compress -t epicmorg/apache2:php7.2 linux/apache2/php7.2 - name: Build Testrail (always latest) run: docker build --compress -t epicmorg/testrail:latest linux/testrail/latest diff --git a/.github/workflows/docker-linux-master.yml b/.github/workflows/docker-linux-master.yml index 07db9706e..fa7258120 100644 --- a/.github/workflows/docker-linux-master.yml +++ b/.github/workflows/docker-linux-master.yml @@ -224,8 +224,10 @@ jobs: run: docker push epicmorg/php:latest - name: Build Apache (latest) - run: docker build --compress -t epicmorg/websites:latest linux/websites/latest + 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) @@ -326,18 +328,24 @@ jobs: run: docker system prune --all --force --volumes - name: Build Apache + PHP7.4 - run: docker build --compress -t epicmorg/websites:php7.4 linux/websites/php7.4 + 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: Build Apache + PHP7.3 - run: docker build --compress -t epicmorg/websites:php7.3 linux/websites/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: Build Apache + PHP7.2 - run: docker build --compress -t epicmorg/websites:php7.2 linux/websites/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: Cleanup