Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use single nginx container for app and docusaurus #3367

Merged
merged 1 commit into from
Apr 5, 2022

Conversation

menghif
Copy link
Contributor

@menghif menghif commented Mar 30, 2022

Issue This PR Addresses

Fixes #2993

Type of Change

  • Bugfix: Change which fixes an issue
  • New Feature: Change which adds functionality
  • Documentation Update: Change which improves documentation
  • UI: Change which improves UI

Description

This PR adds a Dockerfile to share a single nginx container for our web app and docusaurus.

Steps to test the PR

  • pnpm i
  • pnpm services:start

Checklist

  • Quality: This PR builds and passes our npm test and works locally
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Screenshots: This PR includes screenshots or GIFs of the changes made or an explanation of why it does not (if applicable)
  • Documentation: This PR includes updated/added documentation to user exposed functionality or configuration variables are added/changed or an explanation of why it does not(if applicable)

@gitpod-io
Copy link

gitpod-io bot commented Mar 30, 2022

src/web/Dockerfile Outdated Show resolved Hide resolved
@menghif menghif self-assigned this Mar 30, 2022
config/nginx.conf.development.template Outdated Show resolved Hide resolved
src/web/Dockerfile Outdated Show resolved Hide resolved
docker/development.yml Outdated Show resolved Hide resolved
src/web/Dockerfile Outdated Show resolved Hide resolved
src/web/Dockerfile Outdated Show resolved Hide resolved
@manekenpix
Copy link
Member

@menghif can you rebase to get the changes in #3376?

src/web/Dockerfile Outdated Show resolved Hide resolved
@menghif
Copy link
Contributor Author

menghif commented Apr 3, 2022

Rebased and ready to review. I noticed we now have the following localhost:8000/docs/docs/overview:

Screen Shot 2022-04-03 at 12 21 02 PM

I will reconfigure Docusaurus in a followup issue.

Copy link
Contributor

@Kevan-Y Kevan-Y left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, great work @menghif.

Copy link
Member

@manekenpix manekenpix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍
@menghif were you planning to apply the changes in this PR to staging and production, or are you going to do it in a different PR?

@menghif
Copy link
Contributor Author

menghif commented Apr 5, 2022

LGTM 👍 @menghif were you planning to apply the changes in this PR to staging and production, or are you going to do it in a different PR?

In a followup.

@menghif menghif merged commit e540139 into Seneca-CDOT:master Apr 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Share single nginx container for all static sites
6 participants