Skip to content

Commit 531a904

Browse files
authored
Merge branch 'develop' into feature/ssl-off
2 parents 55ceb9e + fdec463 commit 531a904

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/test_and_build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,9 @@ jobs:
172172
173173
deploy: #-----------------------------------------------------------------------
174174
name: Deploy Phar
175-
if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
175+
if: |
176+
github.repository_owner == 'EasyEngine' &&
177+
(github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master')
176178
runs-on: ubuntu-latest
177179
needs: [build, test]
178180

@@ -209,6 +211,7 @@ jobs:
209211
run: |
210212
md5sum phar/$FILENAME | cut -d ' ' -f 1 > phar/$FILENAME.md5
211213
sha512sum phar/$FILENAME | cut -d ' ' -f 1 > phar/$FILENAME.sha512
214+
212215
- name: Commit files
213216
run: |
214217
git config --local user.email "[email protected]"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ EasyEngine makes it greatly easy to manage nginx, a fast web-server software tha
1919

2020
### Linux
2121

22-
For Linux, we have created an installer script which will install all the dependencies for you. We have tested this on Ubuntu 14.04, 16.04, 18.04 and Debian 8.
22+
For Linux, we have created an installer script which will install all the dependencies for you. We have tested this on Ubuntu 14.04, 16.04, 18.04 and Debian 8, Debian 10.
2323

2424
```bash
2525
wget -qO ee https://rt.cx/ee4 && sudo bash ee

php/commands/src/CLI_Command.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@ public function self_uninstall( $args, $assoc_args ) {
506506
EE::confirm( "Are you sure you want to remove EasyEngine and all its sites(along with their data)?\nThis is an irreversible action. No backup will be kept.", $assoc_args );
507507

508508
EE::exec( 'docker rm -f $(docker ps -aqf label=org.label-schema.vendor="EasyEngine")' );
509-
EE::exec( 'docker network prune -f $(docker network ls -f "label=org.label-schema.vendor=EasyEngine")' );
509+
EE::exec( 'docker network rm $(docker network ls -f "label=org.label-schema.vendor=EasyEngine" --format="{{.Name}}")' );
510510
EE::exec( 'docker volume rm -f $(docker volume ls -f "label=org.label-schema.vendor=EasyEngine" -q)' );
511511
EE::exec( 'docker image rm $(docker image ls -f "label=org.label-schema.vendor=EasyEngine" -q)' );
512512

0 commit comments

Comments
 (0)