Skip to content

Commit 94c9b5f

Browse files
Ticket #11 : Invoke a function
1 parent 8a3cf38 commit 94c9b5f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+743
-44
lines changed

WebsiteDockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM nginx
2+
3+
COPY build/results/docker/Website/ App/
4+
COPY conf/docker/website/ /etc/nginx/
5+
6+
EXPOSE 4200

conf/docker/website/nginx.conf

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
events{}
2+
http {
3+
include /etc/nginx/mime.types;
4+
server {
5+
listen 4200;
6+
server_name localhost;
7+
root /App;
8+
index index.html;
9+
location / {
10+
try_files $uri $uri/ /index.html;
11+
}
12+
}
13+
}

default.ps1

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ task publish {
2424
exec { dotnet publish $source_dir\FaasNet.Kubernetes\FaasNet.Kubernetes.csproj -c $config -o $result_dir\services\Kubernetes }
2525
exec { dotnet publish $source_dir\FaasNet.Gateway.Startup\FaasNet.Gateway.Startup.csproj -c $config -o $result_dir\services\Gateway }
2626
exec { dotnet publish $source_dir\FaasNet.CLI\FaasNet.CLI.csproj -c $config -o $result_dir\cli }
27+
exec { npm run docker --prefix $source_dir\FaasNet.Website }
2728
}
2829

2930
task clean {
@@ -71,13 +72,15 @@ task publishHelmAndWebsite {
7172

7273
task buildLocalDockerImage -depends publish {
7374
exec { docker build -f RuntimeGetSqlDockerfile -t localhost:5000/faasgetsql . }
74-
exec { docker build -f RuntimeGetSqlDockerfile -t localhost:5000/faastransform . }
75+
exec { docker build -f RuntimeTransformDockerfile -t localhost:5000/faastransform . }
7576
exec { docker build -f KubernetesDockerfile -t localhost:5000/faaskubernetes . }
7677
exec { docker build -f GatewayDockerfile -t localhost:5000/faasgateway . }
78+
exec { docker build -f WebsiteDockerfile -t localhost:5000/faaswebsite . }
7779
exec { docker push localhost:5000/faasgetsql }
7880
exec { docker push localhost:5000/faastransform }
7981
exec { docker push localhost:5000/faaskubernetes }
8082
exec { docker push localhost:5000/faasgateway }
83+
exec { docker push localhost:5000/faaswebsite }
8184
}
8285

8386
task initLocalKubernetes {
@@ -89,6 +92,21 @@ task initLocalKubernetes {
8992
exec { kubectl apply -f ./kubernetes/faas-kubernetes-svc.yml --namespace=faas }
9093
exec { kubectl apply -f ./kubernetes/run-faas-gateway.yml --namespace=faas }
9194
exec { kubectl apply -f ./kubernetes/faas-gateway-svc.yml --namespace=faas }
95+
exec { kubectl apply -f ./kubernetes/run-website.yml --namespace=faas }
96+
exec { kubectl apply -f ./kubernetes/faas-website-svc.yml --namespace=faas }
97+
}
98+
99+
task builderDockerImage -depends publish {
100+
exec { docker build -f RuntimeGetSqlDockerfile -t simpleidserver/faasgetsql:0.0.3 . }
101+
exec { docker build -f RuntimeTransformDockerfile -t simpleidserver/faastransform:0.0.3 . }
102+
exec { docker build -f KubernetesDockerfile -t simpleidserver/faaskubernetes:0.0.3 . }
103+
exec { docker build -f GatewayDockerfile -t simpleidserver/faasgateway:0.0.3 . }
104+
exec { docker build -f WebsiteDockerfile -t simpleidserver/faaswebsite:0.0.3 . }
105+
exec { docker push simpleidserver/faasgetsql:0.0.3 }
106+
exec { docker push simpleidserver/faastransform:0.0.3 }
107+
exec { docker push simpleidserver/faaskubernetes:0.0.3 }
108+
exec { docker push simpleidserver/faasgateway:0.0.3 }
109+
exec { docker push simpleidserver/faaswebsite:0.0.3 }
92110
}
93111

94112
task pack -depends release, compile {
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: faas-website-externalentry
5+
spec:
6+
type: NodePort
7+
selector:
8+
run: faas-website
9+
ports:
10+
- port: 4200
11+
protocol: TCP
12+
targetPort: 4200
13+
nodePort: {{ .Values.website.nodePort }}

helm/templates/run-website.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: faas-website
5+
spec:
6+
selector:
7+
matchLabels:
8+
run: faas-website
9+
replicas: {{ .Values.website.replicaCount }}
10+
template:
11+
metadata:
12+
labels:
13+
run: faas-website
14+
spec:
15+
containers:
16+
- name: faas-website
17+
image: "{{ .Values.website.image }}:{{ .Values.website.tag }}"
18+
ports:
19+
- containerPort: 4200

helm/values.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
kubernetes:
22
image: simpleidserver/faaskubernetes
3-
tag: "0.0.1"
3+
tag: "0.0.3"
44
replicaCount: 1
5+
website:
6+
image: simpleidserver/faaswebsite
7+
tag: "0.0.3"
8+
replicaCount: 1
9+
website: 30003
510
gateway:
611
image: simpleidserver/faasgateway
7-
tag: "0.0.1"
12+
tag: "0.0.3"
813
replicaCount: 1
914
nodePort: 30001

kubernetes/faas-gateway-svc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: faas-gateway-entry
4+
name: faas-gateway-externalentry
55
spec:
66
type: NodePort
77
selector:

kubernetes/faas-website-svc.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: faas-website-externalentry
5+
spec:
6+
type: NodePort
7+
selector:
8+
run: faas-website
9+
ports:
10+
- port: 4200
11+
protocol: TCP
12+
targetPort: 4200
13+
nodePort: 30003

kubernetes/run-website.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: faas-website
5+
spec:
6+
selector:
7+
matchLabels:
8+
run: faas-website
9+
replicas: 1
10+
template:
11+
metadata:
12+
labels:
13+
run: faas-website
14+
spec:
15+
containers:
16+
- name: faas-website
17+
image: localhost:5000/faaswebsite
18+
ports:
19+
- containerPort: 4200

src/FaasNet.CLI/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ class Program
1717
static void Main(string[] args)
1818
{
1919
MenuHelper.Execute(args, Commands);
20-
string ss = "";
2120
}
2221
}
2322
}

0 commit comments

Comments
 (0)