Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #497 from maxking/docs

Browse Source 
Publish rolling releases on main branch
This commit is contained in:
Abhilash Raj
2021-08-25 23:15:42 -07:00
committed by GitHub
parent b49931b7c1 a849a41c57
commit 3b8ed3f9e9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis/deploy.py
View File

@@ -32,7 +32,7 @@ USER = 'maxking'
TAG_VAR = 'CIRCLE_TAG' TAG_VAR = 'CIRCLE_TAG'
BRANCH_VAR = 'CIRCLE_BRANCH' BRANCH_VAR = 'CIRCLE_BRANCH'
PRIMARY_BRANCH = 'master' PRIMARY_BRANCH = 'main'
def tag(original, final): def tag(original, final):
@@ -89,7 +89,7 @@ def main():
elif os.environ.get(BRANCH_VAR) == PRIMARY_BRANCH: elif os.environ.get(BRANCH_VAR) == PRIMARY_BRANCH:
img_tag = 'rolling' img_tag = 'rolling'
else: else:
print(f'Not running on master branch or Git tag so not publishing...') print(f'Not running on {PRIMARY_BRANCH} branch or Git tag so not publishing...')
exit(0) exit(0)
for url in ('quay.io', 'docker.io', 'ghcr.io'): for url in ('quay.io', 'docker.io', 'ghcr.io'):

2
README.md
View File

@@ -488,7 +488,7 @@ that by adding the following to your configuration:
location / { location / {
proxy_pass http://localhost:8000; proxy_pass http://127.0.0.1:8000;
include uwsgi_params; include uwsgi_params;
uwsgi_read_timeout 300; uwsgi_read_timeout 300;
proxy_set_header Host $host; proxy_set_header Host $host;