Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Merge requests
!104
nginx will now serve our UI instead of the ng development server
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
nginx will now serve our UI instead of the ng development server
WS-105-serve-ui-with-nginx
into
main
Overview
1
Commits
1
Pipelines
2
Changes
2
Merged
Andrew Kapuscinski
requested to merge
WS-105-serve-ui-with-nginx
into
main
4 years ago
Overview
1
Commits
1
Pipelines
2
Changes
2
Expand
0
0
Merge request reports
Compare
main
version 1
be857fe6
4 years ago
main (base)
and
latest version
latest version
0f77e5ea
1 commit,
4 years ago
version 1
be857fe6
1 commit,
4 years ago
2 files
+
42
−
2
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
apps/web/Dockerfile.dev
+
25
−
2
Options
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
Loading