From 110216ebbf8451549c9d6094157892495ba40d4a Mon Sep 17 00:00:00 2001 From: Andrew Davison Date: Mon, 2 Dec 2024 15:22:28 +0100 Subject: [PATCH] change staging deployment to run on port 80, since SSL is provided by kubernetes --- deployment/Dockerfile.staging | 5 ++--- deployment/nginx-app-staging.conf | 8 +------- src/globals-staging.js | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/deployment/Dockerfile.staging b/deployment/Dockerfile.staging index 0117cb2..f11a974 100644 --- a/deployment/Dockerfile.staging +++ b/deployment/Dockerfile.staging @@ -2,9 +2,9 @@ # as it contains only the final built app # build environment -FROM docker-registry.ebrains.eu/neuromorphic/node:20-alpine as build +FROM docker-registry.ebrains.eu/neuromorphic/node:20-alpine AS build WORKDIR /app -ENV PATH /app/node_modules/.bin:$PATH +ENV PATH=/app/node_modules/.bin:$PATH COPY package.json ./ COPY package-lock.json ./ RUN npm ci --silent --legacy-peer-deps @@ -17,5 +17,4 @@ FROM docker-registry.ebrains.eu/neuromorphic/nginx:stable-alpine COPY deployment/nginx-app-staging.conf /etc/nginx/conf.d/default.conf COPY --from=build /app/dist /usr/share/nginx/html EXPOSE 80 -EXPOSE 443 CMD ["nginx", "-g", "daemon off;"] diff --git a/deployment/nginx-app-staging.conf b/deployment/nginx-app-staging.conf index 74d1bb4..3835203 100644 --- a/deployment/nginx-app-staging.conf +++ b/deployment/nginx-app-staging.conf @@ -2,17 +2,11 @@ server { - listen 443 ssl; - - # ssl on; - ssl_certificate /etc/letsencrypt/live/job-manager-staging.hbpneuromorphic.eu/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/job-manager-staging.hbpneuromorphic.eu/privkey.pem; + listen 80; root /usr/share/nginx/html; index index.html; - server_name job-manager-staging.hbpneuromorphic.eu; - location / { try_files $uri $uri/ /index.html; } diff --git a/src/globals-staging.js b/src/globals-staging.js index cf2bda0..d01a8cd 100644 --- a/src/globals-staging.js +++ b/src/globals-staging.js @@ -1,7 +1,7 @@ export const jobQueueServer = "https://nmpi-v3-staging.hbpneuromorphic.eu"; export const authServer = "https://iam-int.ebrains.eu"; export const authClientId = "neuromorphic-remote-access-staging"; -export const driveServer = "https://corsproxy.hbpneuromorphic.eu/https://drive-int.ebrains.eu"; +export const driveServer = "https://corsproxy.apps.tc.humanbrainproject.eu/https://drive-int.ebrains.eu"; export const hw_options = [ "BrainScaleS",