Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • ssa/workspaces
1 result
Show changes
Commits on Source (2)
FROM marconi.aoc.nrao.edu/ops/base:nodejs-14
FROM marconi.aoc.nrao.edu/ops/base:nodejs-14 as base-build
# TODO: install chrome dependencies for e2e test here
WORKDIR /app
......@@ -12,4 +14,25 @@ RUN npm install \
COPY ./apps/web ./
CMD [ "npm", "start" ]
\ No newline at end of file
# TODO: Run e2e tests here
# Build the angular app
RUN ./node_modules/.bin/ng build --prod --output-path=dist
# Use nginx base image
FROM nginx:1.19.7-alpine
# Copy WS nginx config from base-build stage
COPY --from=base-build /app/ws-nginx.conf /etc/nginx/conf.d/
# Remove default nginx config
RUN rm /etc/nginx/conf.d/default.conf
# Copy Angular build from base-build stage
COPY --from=base-build /app/dist /usr/share/nginx/html
# Expose port
EXPOSE 4444
# Run nginx with daemon off to run as foreground process
CMD nginx -g "daemon off;"
\ No newline at end of file
# Workspaces NGINX config
server {
listen 80;
listen [::]:80;
server_name localhost;
location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
}
\ No newline at end of file
......@@ -38,7 +38,7 @@ def capability_routes(config: Configurator):
)
config.add_route(
name="edit_capability",
pattern=f"{capability_url}/edit",
pattern=f"{capability_url}",
request_method="POST",
)
config.add_route(
......@@ -66,7 +66,7 @@ def capability_request_routes(config: Configurator):
)
config.add_route(
"edit_capability_request",
f"{request_url}/edit",
f"{request_url}",
request_method="POST",
)
config.add_route("submit_capability_request", f"{request_url}/submit", request_method="POST")
......