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.

Sign up for GitHub

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

Jump to bottom

Added support for hosting website via nginx docker #153

Merged
merged 12 commits into from
Oct 11, 2023
Merged

Added support for hosting website via nginx docker #153

merged 12 commits into from
Oct 11, 2023

Commits on Jul 1, 2023

  1. [MarmadileManteater] Dockerfile, changed node_modules to dist/web 

    Co-authored-by: Emma <MarmadileManteater@proton.me>
    @OwenTruong @MarmadileManteater
    OwenTruong and MarmadileManteater committed Jul 1, 2023
    Configuration menu
    Copy the full SHA
    c5e869f View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Update Dockerfile

    @MarmadileManteater
    MarmadileManteater committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    86c240f View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Merge branch 'MarmadileManteater:development' into dockerize

    @OwenTruong
    OwenTruong committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    b9fc9ab View commit details
    Browse the repository at this point in the history

  2. No conditional copy allowed in Docker so "COPY dist[t]/web ./dist/" w… 

    …ill fail if dist/web does not exist
    @OwenTruong
    OwenTruong committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    e5c56cf View commit details
    Browse the repository at this point in the history

  3. removed unnecessary condition in run instruction and copying of /app/… 

    …dist/web from dep, and specified that building image on Apple Silicon may be slow
    @OwenTruong
    OwenTruong committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    7300fec View commit details
    Browse the repository at this point in the history

  4. moved comment up a line

    @OwenTruong
    OwenTruong committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    26a0d8a View commit details
    Browse the repository at this point in the history

  5. removed unnecessary conditionals in build stage yarn pack:web

    @OwenTruong
    OwenTruong committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    be2aea2 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. reverted changes from August 21st that removed the conditional copy a… 

    …nd run statements
    @OwenTruong
    OwenTruong committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    6bbf92b View commit details
    Browse the repository at this point in the history

  2. changed warning on local docker build to be Apple Silicon specific

    @OwenTruong
    OwenTruong committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    a81dc7d View commit details
    Browse the repository at this point in the history

  3. pulled new changes from development branch into dockerize branch, and… 

    … also resolved merge conflict in README.md
    @OwenTruong
    OwenTruong committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    9e31c77 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. Merge branch 'development' into dockerize

    @OwenTruong
    OwenTruong committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    e2321e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2023

  1. Copying host's dist/web to container's dist/web instead of dist/ 

    Co-authored-by: Emma <MarmadileManteater@proton.me>
    @OwenTruong @MarmadileManteater
    OwenTruong and MarmadileManteater committed Sep 3, 2023
    Configuration menu
    Copy the full SHA
    20269ff View commit details
    Browse the repository at this point in the history