diff --git a/argocd/deployment/configmap.yml b/argocd/deployment/configmap.yml index 69293d2..167645b 100644 --- a/argocd/deployment/configmap.yml +++ b/argocd/deployment/configmap.yml @@ -6,5 +6,6 @@ metadata: data: DB_HOST: "192.168.1.30" DB_DATABASE: "loading" - DB_USERNAME: "loading" - DB_PASSWORD: "loading" \ No newline at end of file + DB_USER: "loading" + DB_PASSWORD: "loading" + CORS_ORIGIN: "https://reloading.internal.siteworxpro.com" \ No newline at end of file diff --git a/argocd/deployment/ingress.yml b/argocd/deployment/ingress.yml new file mode 100644 index 0000000..987ede3 --- /dev/null +++ b/argocd/deployment/ingress.yml @@ -0,0 +1,25 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: reloading-ingress + namespace: reloading +spec: + - rules: + - host: https://reloading.internal.siteworxpro.com + http: + paths: + - backend: + service: + name: reloading-frontend + port: + number: 80 + pathType: Exact + path: / + + - backend: + service: + name: reloading-backend + port: + number: 8080 + pathType: Prefix + path: / \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 309b0e4..297b258 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,14 +1,15 @@ services: frontend: - image: scr.siteworxpro.com/reloading-manager/frontend:v0.0.16 + image: scr.siteworxpro.com/reloading-manager/frontend:v0.0.17 ports: - "80:80" backend: - image: scr.siteworxpro.com/reloading-manager/backend:v0.0.16 + image: scr.siteworxpro.com/reloading-manager/backend:v0.0.17 environment: DB_HOST: 192.168.1.30 DB_DATABASE: loading DB_USER: loading DB_PASSWORD: loading + CORS_ORIGIN: http://localhost ports: - "8080:8080"