From aa104b195798b2e3847cfd62b41b1f6fed1b171a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carsten=20L=C3=A4ngerer?= Date: Thu, 23 Nov 2023 15:23:41 +0100 Subject: [PATCH 1/2] Make NGNIX unprivileged docker images as default --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e15cf1df17d..6016e1cec6d 100644 --- a/build.gradle +++ b/build.gradle @@ -158,7 +158,7 @@ subprojects { sp -> def buildArch = System.getenv('DOCKER_BUILD_ARCH') ?: isArm64 ? 'arm64' : 'amd64' def buildPlatform = System.getenv('DOCKER_BUILD_PLATFORM') ?: isArm64 ? 'linux/arm64' : 'linux/amd64' def alpineImage = System.getenv('ALPINE_IMAGE') ?: isArm64 ? 'arm64v8/alpine:3.14' : 'amd64/alpine:3.14' - def nginxImage = System.getenv('NGINX_IMAGE') ?: isArm64 ? 'arm64v8/nginx:alpine' : 'amd64/nginx:alpine' + def nginxImage = System.getenv('NGINX_IMAGE') ?: isArm64 ? 'arm64v8/"nginxinc/nginx-unprivileged:alpine' : 'amd64/"nginxinc/nginx-unprivileged:alpine' // Used by the platform -- Must be an Amazon Corretto-based image for build to work without modification to Dockerfile instructions def openjdkImage = System.getenv('JDK_IMAGE') ?: 'airbyte/airbyte-base-java-image:2.1.0' From 6446c8351dd4e4406a20c8f3ff24510018ea60aa Mon Sep 17 00:00:00 2001 From: nexcalmart <134620944+nexcalmart@users.noreply.github.com> Date: Tue, 28 Nov 2023 08:49:41 +0100 Subject: [PATCH 2/2] Switch deployment to default port 8080 --- charts/airbyte-webapp/templates/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/airbyte-webapp/templates/deployment.yaml b/charts/airbyte-webapp/templates/deployment.yaml index 881796426a9..a0f21e42000 100644 --- a/charts/airbyte-webapp/templates/deployment.yaml +++ b/charts/airbyte-webapp/templates/deployment.yaml @@ -141,7 +141,7 @@ spec: {{- end }} ports: - name: http - containerPort: 80 + containerPort: 8080 protocol: TCP {{- if .Values.resources }} resources: {{- toYaml .Values.resources | nindent 10 }}