websites -> apache2 in wf

This commit is contained in:
STAM 2021-04-01 13:45:39 +03:00
parent 9dfa7c701c
commit f1b178ea7c
2 changed files with 16 additions and 8 deletions

View File

@ -187,16 +187,16 @@ jobs:
run: docker system prune --all --force --volumes run: docker system prune --all --force --volumes
- name: Build Apache (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: Build Apache + PHP7.4 - 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 - 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 - 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) - name: Build Testrail (always latest)
run: docker build --compress -t epicmorg/testrail:latest linux/testrail/latest run: docker build --compress -t epicmorg/testrail:latest linux/testrail/latest

View File

@ -224,8 +224,10 @@ jobs:
run: docker push epicmorg/php:latest run: docker push epicmorg/php:latest
- name: Build Apache (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) - name: Push Apache (latest)
run: docker push epicmorg/apache2:latest
- name: Push Apache:websites (latest)
run: docker push epicmorg/websites:latest run: docker push epicmorg/websites:latest
- name: Build NGinx (latest) - name: Build NGinx (latest)
@ -326,18 +328,24 @@ jobs:
run: docker system prune --all --force --volumes run: docker system prune --all --force --volumes
- name: Build Apache + PHP7.4 - 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 - 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 run: docker push epicmorg/websites:php7.4
- name: Build Apache + PHP7.3 - 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 - 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 run: docker push epicmorg/websites:php7.3
- name: Build Apache + PHP7.2 - 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 - 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 run: docker push epicmorg/websites:php7.2
- name: Cleanup - name: Cleanup