NextJS: Use correct default port number 3000
Change-Id: Iba055accf2f08a167d03f036df20bf9a9674e88d
diff --git a/charts/app-runner/templates/install.yaml b/charts/app-runner/templates/install.yaml
index 00ba74e..5ba1aac 100644
--- a/charts/app-runner/templates/install.yaml
+++ b/charts/app-runner/templates/install.yaml
@@ -46,7 +46,7 @@
app: app-app
ports:
- name: api
- port: 3000
+ port: 80
targetPort: api
protocol: TCP
---
@@ -88,7 +88,7 @@
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: api
- containerPort: 3000
+ containerPort: {{ .Values.apiPort }}
protocol: TCP
{{- if .Values.appPorts }}
{{ toYaml .Values.appPorts | nindent 8 }}
@@ -100,7 +100,7 @@
fieldPath: status.podIP
command:
- app-runner
- - --port=3000
+ - --port={{ .Values.apiPort }}
- --app-id={{ .Values.appId }}
- --app-dir={{ .Values.appDir }}
- --repo-addr={{ .Values.repoAddr }}
diff --git a/charts/app-runner/values.yaml b/charts/app-runner/values.yaml
index 795f2c0..aaf8592 100644
--- a/charts/app-runner/values.yaml
+++ b/charts/app-runner/values.yaml
@@ -13,3 +13,4 @@
volumes: []
runtimeClassName: ""
extraContainers: []
+apiPort: 3000
diff --git a/core/installer/app_configs/app_base.cue b/core/installer/app_configs/app_base.cue
index 5b4b974..65b0813 100644
--- a/core/installer/app_configs/app_base.cue
+++ b/core/installer/app_configs/app_base.cue
@@ -34,9 +34,11 @@
#Protocol: "TCP" | "UDP"
+#PortValue: int & > 0 & < 65536
+
#Port: {
name: string
- value: int & > 0 & < 65536
+ value: #PortValue
protocol: #Protocol | *"TCP"
}
diff --git a/core/installer/app_configs/dodo_app.cue b/core/installer/app_configs/dodo_app.cue
index 87a1f5f..98adcd0 100644
--- a/core/installer/app_configs/dodo_app.cue
+++ b/core/installer/app_configs/dodo_app.cue
@@ -102,6 +102,7 @@
dev: #Dev | *{ enabled: false }
vm: #VMCustomization
// TODO(gio): check for duplicate values
+ apiPort: #PortValue | *3000
ports: [...#Port]
lastCmdEnv: [
@@ -232,9 +233,10 @@
#NextjsDeno2AppTmpl: #AppTmpl & {
type: "nextjs:deno-2.0.0"
+ apiPort: 2000
ports: [{
name: "web"
- value: 8000
+ value: 3000
}]
rootDir: _appDir
preBuildCommands: [...#Command] | *[]
@@ -258,7 +260,7 @@
env: lastCmdEnv
}, {
bin: "/usr/bin/deno",
- args: ["task", "start", "-p", "8000"]
+ args: ["task", "start"]
env: lastCmdEnv
}]
@@ -367,6 +369,7 @@
}]
}]
}
+ apiPort: _app.apiPort
appPorts: [for p in _app.ports {
name: p.name
containerPort: p.value