change coderd ports to be above 1024 in helm

deansheather · deansheather · commit f5f6afc29092 · 2022-07-22T16:55:21.000Z
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ LABEL \
 ADD coder /opt/coder
 
 # Create coder group and user.
-RUN addgroup -g 1000 coder &&
+RUN addgroup -g 1000 coder && \
 	adduser -D -g "" -h /home/coder -G coder -u 1000 coder
 USER coder:coder
 
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
           env:
             {{- if .Values.coder.tls.secretName }}
             - name: CODER_ADDRESS
-              value: "0.0.0.0:443"
+              value: "0.0.0.0:8443"
             - name: CODER_TLS_ENABLE
               value: "true"
             - name: CODER_TLS_CERT_FILE
@@ -37,19 +37,19 @@ spec:
               value: /etc/ssl/certs/coder/tls.key
             {{- else }}
             - name: CODER_ADDRESS
-              value: "0.0.0.0:80"
+              value: "0.0.0.0:8080"
             {{- end }}
             {{- with .Values.coder.env -}}
             {{ toYaml . | nindent 12 }}
             {{- end }}
           ports:
             {{- if .Values.coder.tls.secretName }}
             - name: https
-              containerPort: 443
+              containerPort: 8443
               protocol: TCP
             {{- else }}
             - name: http
-              containerPort: 80
+              containerPort: 8080
               protocol: TCP
             {{- end }}
           readinessProbe:
diff --git a/scripts/version.sh b/scripts/version.sh
@@ -15,6 +15,11 @@ set -euo pipefail
 source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
 cdroot
 
+if [[ "${CODER_FORCE_VERSION:-}" != "" ]]; then
+	echo "$CODER_FORCE_VERSION"
+	exit 0
+fi
+
 last_tag="$(git describe --tags --abbrev=0)"
 version="$last_tag"
 
