Merge branch 'master' into api
This commit is contained in:
		
						commit
						80647d960a
					
				@ -1,4 +1,4 @@
 | 
				
			|||||||
FROM python:alpine
 | 
					FROM python:alpine3.14
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Getting things ready
 | 
					# Getting things ready
 | 
				
			||||||
WORKDIR /usr/src/shynet
 | 
					WORKDIR /usr/src/shynet
 | 
				
			||||||
 | 
				
			|||||||
@ -17,7 +17,7 @@ spec:
 | 
				
			|||||||
    spec:
 | 
					    spec:
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
      - name: "shynet-webserver"
 | 
					      - name: "shynet-webserver"
 | 
				
			||||||
        image: "milesmcc/shynet:latest"
 | 
					        image: "milesmcc/shynet:edge" # Change to the version appropriate for you (e.g., :latest)
 | 
				
			||||||
        imagePullPolicy: Always
 | 
					        imagePullPolicy: Always
 | 
				
			||||||
        envFrom:
 | 
					        envFrom:
 | 
				
			||||||
        - secretRef:
 | 
					        - secretRef:
 | 
				
			||||||
@ -42,7 +42,7 @@ spec:
 | 
				
			|||||||
    spec:
 | 
					    spec:
 | 
				
			||||||
      containers:
 | 
					      containers:
 | 
				
			||||||
      - name: "shynet-celeryworker"
 | 
					      - name: "shynet-celeryworker"
 | 
				
			||||||
        image: "milesmcc/shynet:latest"
 | 
					        image: "milesmcc/shynet:edge" # Change to the version appropriate for you (e.g., :latest)
 | 
				
			||||||
        command: ["./celeryworker.sh"]
 | 
					        command: ["./celeryworker.sh"]
 | 
				
			||||||
        imagePullPolicy: Always
 | 
					        imagePullPolicy: Always
 | 
				
			||||||
        envFrom:
 | 
					        envFrom:
 | 
				
			||||||
@ -95,7 +95,7 @@ spec:
 | 
				
			|||||||
  selector:
 | 
					  selector:
 | 
				
			||||||
    app: shynet-webserver
 | 
					    app: shynet-webserver
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
apiVersion: networking.k8s.io/v1beta1
 | 
					apiVersion: networking.k8s.io/v1
 | 
				
			||||||
kind: Ingress
 | 
					kind: Ingress
 | 
				
			||||||
metadata:
 | 
					metadata:
 | 
				
			||||||
  name: shynet-webserver-ingress
 | 
					  name: shynet-webserver-ingress
 | 
				
			||||||
 | 
				
			|||||||
@ -45,11 +45,6 @@ class DateRangeMixin:
 | 
				
			|||||||
                "start": now.replace(day=1),
 | 
					                "start": now.replace(day=1),
 | 
				
			||||||
                "end": now,
 | 
					                "end": now,
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            {
 | 
					 | 
				
			||||||
                "name": "Last month",
 | 
					 | 
				
			||||||
                "start": now.replace(day=1, month=now.month - 1),
 | 
					 | 
				
			||||||
                "end": now.replace(day=1, month=now.month) - timezone.timedelta(days=1),
 | 
					 | 
				
			||||||
            },
 | 
					 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                "name": "This year",
 | 
					                "name": "This year",
 | 
				
			||||||
                "start": now.replace(day=1, month=1),
 | 
					                "start": now.replace(day=1, month=1),
 | 
				
			||||||
 | 
				
			|||||||
@ -22,7 +22,7 @@ from django.contrib.messages import constants as messages
 | 
				
			|||||||
load_dotenv()
 | 
					load_dotenv()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Increment on new releases
 | 
					# Increment on new releases
 | 
				
			||||||
VERSION = "0.11.0"
 | 
					VERSION = "0.12.0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 | 
					# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 | 
				
			||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 | 
					BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user