Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Build Docker images
env:
TAG: dev
run: docker-compose build
run: docker-compose -f docker-compose.build.yml build
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
Expand All @@ -25,4 +25,4 @@ jobs:
- name: Push images to GitHub Container Registry
env:
TAG: dev
run: docker-compose push
run: docker-compose -f docker-compose.build.yml push
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Build Docker images
env:
TAG: latest
run: docker-compose build
run: docker-compose -f docker-compose.build.yml build
- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
Expand All @@ -25,4 +25,4 @@ jobs:
- name: Push images to GitHub Container Registry
env:
TAG: latest
run: docker-compose push
run: docker-compose -f docker-compose.build.yml push
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM nginx:1.20.2
COPY nginx.conf /etc/nginx/nginx.conf.org
COPY health-check.conf /etc/nginx/
COPY health-check.conf netnegar.conf /etc/nginx/
ENV EXPOSED_PORT 443
ENTRYPOINT sh -c 'envsubst \$EXPOSED_PORT < /etc/nginx/nginx.conf.org | tee /etc/nginx/nginx.conf && nginx -g "daemon off;"'
EXPOSE 443
5 changes: 5 additions & 0 deletions docker-compose.build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: '3.8'
services:
nginx:
image: ghcr.io/opexdev/nginx:$TAG
build: .
10 changes: 9 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
version: '3.8'
services:
nginx:
image: ghcr.io/opexdev/nginx:$TAG
image: ghcr.io/opexdev/nginx
build: .
environment:
- EXPOSED_PORT=$EXPOSED_PORT
secrets:
- opex_dev_crt
- private_pem
secrets:
opex_dev_crt:
file: opex.dev.crt
private_pem:
file: private.pem
11 changes: 11 additions & 0 deletions netnegar.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
server {
listen 443 ssl;
listen [::]:443 ssl;

server_name status.opex.dev;

location / {
set $backend http://public.netnegar.io;
proxy_pass $backend;
}
}
2 changes: 2 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,6 @@ http {
rewrite ^/binance/(.*)$ /$1 break;
}
}

include /etc/nginx/netnegar.conf;
}