Skip to content

Commit

Permalink
change staging deployment to run on port 80, since SSL is provided by…
Browse files Browse the repository at this point in the history
… kubernetes
  • Loading branch information
apdavison committed Dec 2, 2024
1 parent f0425a9 commit 110216e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
5 changes: 2 additions & 3 deletions deployment/Dockerfile.staging
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;"]
8 changes: 1 addition & 7 deletions deployment/nginx-app-staging.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/globals-staging.js
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 110216e

Please sign in to comment.