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

dockerfile + compose for ol-www0 web_nginx #4725

Merged
merged 17 commits into from
Dec 8, 2021
Merged

dockerfile + compose for ol-www0 web_nginx #4725

merged 17 commits into from
Dec 8, 2021

Conversation

mekarpeles
Copy link
Member

@mekarpeles mekarpeles commented Mar 4, 2021

Closes #4252
Closes #4424
Closes #5418

Technical

Testing

Screenshot

Stakeholders

@mekarpeles mekarpeles marked this pull request as draft March 4, 2021 21:41
@cdrini cdrini modified the milestones: Sprint 2021-03, Active Sprint Mar 29, 2021
docker/web_nginx.conf Outdated Show resolved Hide resolved
@cdrini cdrini modified the milestones: Sprint 2021-04, Active Sprint May 3, 2021
@mekarpeles mekarpeles marked this pull request as ready for review June 30, 2021 20:29
Copy link
Collaborator

@cdrini cdrini left a comment

Choose a reason for hiding this comment

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

Some cleaning up now that we're using the new nginx file.

docker-compose.production.yml Outdated Show resolved Hide resolved
docker-compose.production.yml Outdated Show resolved Hide resolved
@@ -25,7 +25,7 @@ http {
server_names_hash_bucket_size 64;
types_hash_bucket_size 64;

log_format iacombined '$seed$remote_addr $host $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" $request_time';
log_format iacombined '$remote_addr_ipscrub $host $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" $request_time';
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is why we no longer need petabox_seed.

Copy link
Collaborator

Choose a reason for hiding this comment

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

TODO: Remove from olsystem; it's in docker-default.

docker/web_nginx.conf Outdated Show resolved Hide resolved
# sitemap generation (we also need olsystem/etc/cron.d + openlibrary/scripts)
- /1/var/lib/openlibrary/sitemaps/sitemaps:/sitemaps
ports:
- 8080:80 # XXX change to 80!!!
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we change this before merging? Doesn't really matter, I guess.

@mekarpeles mekarpeles added this to the Next (proposed) milestone Aug 2, 2021
@mekarpeles mekarpeles added the Priority: 2 Important, as time permits. [managed] label Aug 2, 2021
@cdrini cdrini modified the milestones: Next (proposed), Active Sprint Aug 2, 2021
@cdrini cdrini mentioned this pull request Nov 8, 2021
5 tasks
@cclauss cclauss mentioned this pull request Nov 10, 2021
36 tasks
@cclauss
Copy link
Contributor

cclauss commented Nov 11, 2021

This should be streamlined once #5840 and #5854 have landed.

@cdrini cdrini force-pushed the feature/ol-www0 branch 2 times, most recently from 284dd06 to 43f8b2c Compare November 25, 2021 18:52
This conflicted with out nginx config.
Copy link
Collaborator

@cdrini cdrini left a comment

Choose a reason for hiding this comment

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

We tested covers locally with the new nginx image, and it worked like a charm!

The only thing that's blocked us switching www0 is logs not being backed up to IA 👍

@cdrini cdrini merged commit 129d12f into master Dec 8, 2021
@cdrini cdrini deleted the feature/ol-www0 branch December 8, 2021 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority: 2 Important, as time permits. [managed]
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade to HTTP/2 Migrate ol-www1 to ol-www0 Replace ol-www1 with docker-based ol-www0
3 participants