diff --git a/.github/workflows/docker-linux-develop.yml b/.github/workflows/docker-linux-develop.yml index c889590ee..42accc560 100644 --- a/.github/workflows/docker-linux-develop.yml +++ b/.github/workflows/docker-linux-develop.yml @@ -1,4 +1,4 @@ -name: develop-linux +name: develop on: pull_request: diff --git a/.github/workflows/docker-linux-master.yml b/.github/workflows/docker-linux-master.yml index 2b46d8a76..b820c0ade 100644 --- a/.github/workflows/docker-linux-master.yml +++ b/.github/workflows/docker-linux-master.yml @@ -1,4 +1,4 @@ -name: master-linux +name: master on: push: diff --git a/linux/balancer/latest/Makefile b/linux/balancer/latest/Makefile deleted file mode 100644 index 70405e8a6..000000000 --- a/linux/balancer/latest/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: nginx - -nginx: - docker build --compress -t epicmorg/balancer:latest . - docker push epicmorg/balancer:latest \ No newline at end of file diff --git a/linux/balancer/php/Makefile b/linux/balancer/php/Makefile deleted file mode 100644 index 8f8e7c04b..000000000 --- a/linux/balancer/php/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: nginx - -nginx: - docker build --compress -t epicmorg/balancer:php . - docker push epicmorg/balancer:php \ No newline at end of file diff --git a/linux/balancer/rtmp-hls/Makefile b/linux/balancer/rtmp-hls/Makefile deleted file mode 100644 index 70287cf76..000000000 --- a/linux/balancer/rtmp-hls/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: nginx - -nginx: - docker build --compress -t epicmorg/balancer:rtmp-hls . - docker push epicmorg/balancer:rtmp-hls \ No newline at end of file diff --git a/linux/balancer/latest/Dockerfile b/linux/nginx/latest/Dockerfile similarity index 100% rename from linux/balancer/latest/Dockerfile rename to linux/nginx/latest/Dockerfile diff --git a/linux/nginx/latest/Makefile b/linux/nginx/latest/Makefile new file mode 100644 index 000000000..363a3a882 --- /dev/null +++ b/linux/nginx/latest/Makefile @@ -0,0 +1,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 diff --git a/linux/balancer/latest/README.md b/linux/nginx/latest/README.md similarity index 100% rename from linux/balancer/latest/README.md rename to linux/nginx/latest/README.md diff --git a/linux/balancer/latest/pre/ip2location-description-pak b/linux/nginx/latest/pre/ip2location-description-pak similarity index 100% rename from linux/balancer/latest/pre/ip2location-description-pak rename to linux/nginx/latest/pre/ip2location-description-pak diff --git a/linux/balancer/latest/pre/luajit2-description-pak b/linux/nginx/latest/pre/luajit2-description-pak similarity index 100% rename from linux/balancer/latest/pre/luajit2-description-pak rename to linux/nginx/latest/pre/luajit2-description-pak diff --git a/linux/balancer/latest/pre/nginx-description-pak b/linux/nginx/latest/pre/nginx-description-pak similarity index 100% rename from linux/balancer/latest/pre/nginx-description-pak rename to linux/nginx/latest/pre/nginx-description-pak diff --git a/linux/balancer/latest/pre/ngninx.pre.tar.gz b/linux/nginx/latest/pre/ngninx.pre.tar.gz similarity index 100% rename from linux/balancer/latest/pre/ngninx.pre.tar.gz rename to linux/nginx/latest/pre/ngninx.pre.tar.gz diff --git a/linux/balancer/php/Dockerfile b/linux/nginx/php/Dockerfile similarity index 99% rename from linux/balancer/php/Dockerfile rename to linux/nginx/php/Dockerfile index b658799a0..58d48a397 100644 --- a/linux/balancer/php/Dockerfile +++ b/linux/nginx/php/Dockerfile @@ -83,7 +83,7 @@ RUN pecl install smbclient && \ ################################################################## -FROM epicmorg/balancer:latest +FROM epicmorg/nginx:latest LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/nginx/php/Makefile b/linux/nginx/php/Makefile new file mode 100644 index 000000000..ef9dc1027 --- /dev/null +++ b/linux/nginx/php/Makefile @@ -0,0 +1,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 diff --git a/linux/balancer/php/README.md b/linux/nginx/php/README.md similarity index 100% rename from linux/balancer/php/README.md rename to linux/nginx/php/README.md diff --git a/linux/balancer/rtmp-hls/Dockerfile b/linux/nginx/rtmp-hls/Dockerfile similarity index 99% rename from linux/balancer/rtmp-hls/Dockerfile rename to linux/nginx/rtmp-hls/Dockerfile index 0223f670e..e986263e2 100644 --- a/linux/balancer/rtmp-hls/Dockerfile +++ b/linux/nginx/rtmp-hls/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/balancer +FROM epicmorg/nginx LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/nginx/rtmp-hls/Makefile b/linux/nginx/rtmp-hls/Makefile new file mode 100644 index 000000000..1801aab97 --- /dev/null +++ b/linux/nginx/rtmp-hls/Makefile @@ -0,0 +1,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 diff --git a/linux/balancer/rtmp-hls/README.md b/linux/nginx/rtmp-hls/README.md similarity index 100% rename from linux/balancer/rtmp-hls/README.md rename to linux/nginx/rtmp-hls/README.md diff --git a/linux/balancer/rtmp-hls/conf/nginx.conf b/linux/nginx/rtmp-hls/conf/nginx.conf similarity index 100% rename from linux/balancer/rtmp-hls/conf/nginx.conf rename to linux/nginx/rtmp-hls/conf/nginx.conf diff --git a/linux/balancer/rtmp-hls/conf/nginx_no-ffmpeg.conf b/linux/nginx/rtmp-hls/conf/nginx_no-ffmpeg.conf similarity index 100% rename from linux/balancer/rtmp-hls/conf/nginx_no-ffmpeg.conf rename to linux/nginx/rtmp-hls/conf/nginx_no-ffmpeg.conf diff --git a/linux/balancer/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf b/linux/nginx/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf similarity index 100% rename from linux/balancer/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf rename to linux/nginx/rtmp-hls/conf/nginx_rtmp_minimal_no-stats.conf diff --git a/linux/balancer/rtmp-hls/players/dash.html b/linux/nginx/rtmp-hls/players/dash.html similarity index 100% rename from linux/balancer/rtmp-hls/players/dash.html rename to linux/nginx/rtmp-hls/players/dash.html diff --git a/linux/balancer/rtmp-hls/players/hls.html b/linux/nginx/rtmp-hls/players/hls.html similarity index 100% rename from linux/balancer/rtmp-hls/players/hls.html rename to linux/nginx/rtmp-hls/players/hls.html diff --git a/linux/balancer/rtmp-hls/players/hls_hlsjs.html b/linux/nginx/rtmp-hls/players/hls_hlsjs.html similarity index 100% rename from linux/balancer/rtmp-hls/players/hls_hlsjs.html rename to linux/nginx/rtmp-hls/players/hls_hlsjs.html diff --git a/linux/balancer/rtmp-hls/players/rtmp.html b/linux/nginx/rtmp-hls/players/rtmp.html similarity index 100% rename from linux/balancer/rtmp-hls/players/rtmp.html rename to linux/nginx/rtmp-hls/players/rtmp.html diff --git a/linux/balancer/rtmp-hls/players/rtmp_hls.html b/linux/nginx/rtmp-hls/players/rtmp_hls.html similarity index 100% rename from linux/balancer/rtmp-hls/players/rtmp_hls.html rename to linux/nginx/rtmp-hls/players/rtmp_hls.html diff --git a/linux/balancer/rtmp-hls/sources.list.d/sources.buster.list b/linux/nginx/rtmp-hls/sources.list.d/sources.buster.list similarity index 100% rename from linux/balancer/rtmp-hls/sources.list.d/sources.buster.list rename to linux/nginx/rtmp-hls/sources.list.d/sources.buster.list diff --git a/linux/balancer/rtmp-hls/sources.list.d/sources.sid.list b/linux/nginx/rtmp-hls/sources.list.d/sources.sid.list similarity index 100% rename from linux/balancer/rtmp-hls/sources.list.d/sources.sid.list rename to linux/nginx/rtmp-hls/sources.list.d/sources.sid.list diff --git a/linux/balancer/rtmp-hls/sources.list.d/sources.stretch.list b/linux/nginx/rtmp-hls/sources.list.d/sources.stretch.list similarity index 100% rename from linux/balancer/rtmp-hls/sources.list.d/sources.stretch.list rename to linux/nginx/rtmp-hls/sources.list.d/sources.stretch.list