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

build: remove nginx from docker compose #1815

Merged
merged 24 commits into from
Dec 2, 2024
Merged

build: remove nginx from docker compose #1815

merged 24 commits into from
Dec 2, 2024

Conversation

gulfaraz
Copy link
Member

@gulfaraz gulfaraz commented Nov 29, 2024 •
edited
Loading

Describe your changes

I am closing #1733 in favour of this PR because I don't know how to collaborate using git rebase. The rebased commits diverged from my local commits, making it difficult to build on.

  1. Most changes are to remove nginx from the prod docker setup. Details are described in build: remove nginx from docker compose #1733
  2. I changed the user in webhook.service to match the value in the VMs.
  3. I moved raster-files.zip to Azure storage because the docs had dead links. Now the link will not expire.
  4. I made other minor changes such as renaming docker volumes and fixing tailwind line-clamp warning.

Checklist before requesting a review

  • I have performed a self-review of my code
  • I have added tests wherever relevant
  • I have made sure that all automated checks pass before requesting a review

@gulfaraz
build: remove nginx from docker compose #1602
7a5d8d1
@gulfaraz
chore: update package lock
d51c778
@gulfaraz
refactor: move db-init.sql to tools folder
ab51f33
@gulfaraz
fix: rm web-server-network from docker-compose.ci
84247d8
@gulfaraz
chore: expose ports
603a3a9
@gulfaraz
refactor: remove nginx/letsencrypt folder
20cc17d
@gulfaraz
refactor: use same echo message in docker.override and docker.ci
93e27e8
@gulfaraz
build: use cp to expose dashboard build folder
9173926
@gulfaraz
refactor: remove root user override in docker.ci
ce52063
@gulfaraz
fix: move raster-files.zip to azure storage
44c75e3
@gulfaraz
fix: use recursive instead of archive flag in cp
3b704b7
@gulfaraz
fix: remove explicit lineclamp import
4b18118
@gulfaraz
ci: use cache for docker builds
64f9bff
@gulfaraz
ci: reduce build wait time to 30s
ee55fb7
@gulfaraz
ci: cleanup dashboard build
46bd348
@gulfaraz
fix: use azureuser for webhook service
d9af32c
@gulfaraz
fix: set default server name in nginx conf
7228694
@gulfaraz
fix: set correct nginx webserver root
8ac4a23
@gulfaraz
docs: update VM setup
333f130
@gulfaraz
ci: build dashboard and use nginx
511fc1b
@gulfaraz gulfaraz mentioned this pull request Nov 29, 2024
Closed
11 tasks
@gulfaraz gulfaraz marked this pull request as ready for review November 30, 2024 12:45
jannisvisser
jannisvisser requested changes Dec 2, 2024
View reviewed changes
Copy link
Contributor

@jannisvisser jannisvisser left a comment

Choose a reason for hiding this comment

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

1 small question from code review. for the rest looks good. maybe talk it through quickly this afternoon also.

docs/VM_SETUP.md Outdated Show resolved Hide resolved
@gulfaraz gulfaraz merged commit 30670b0 into master Dec 2, 2024
8 checks passed
@gulfaraz gulfaraz deleted the build.nginx-2 branch December 2, 2024 12:02
@gulfaraz gulfaraz mentioned this pull request Dec 2, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jannisvisser jannisvisser jannisvisser approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gulfaraz @jannisvisser