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

Fix API image builds #2410

Merged
merged 3 commits into from
Jun 15, 2023
Merged

Fix API image builds #2410

merged 3 commits into from
Jun 15, 2023

Conversation

zackkrida
Copy link
Member

@zackkrida zackkrida commented Jun 15, 2023

Fixes

Fixes #2411 by @zackkrida

Description

Fixes the conflict when copying over audiowaveform dependencies from the Dockerfile by explicitly copying over subfolder contents instead of the subfolders themselves, which already exist as symlinks in the root of the base image and therefore cause an error when attempting to copy over them.

Testing Instructions

Review the code, CI should pass. After merged, the staging API should continue to work and serve thumbnails.

You can also checkout main and just recreate. Observe that the build fails. Then checkout this branch and just recreate && just up and observe that everything works.

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@zackkrida zackkrida requested a review from a team as a code owner June 15, 2023 14:47
@zackkrida zackkrida requested review from obulat and stacimc June 15, 2023 14:47
@github-actions github-actions bot added the 🧱 stack: api Related to the Django API label Jun 15, 2023
@openverse-bot openverse-bot added the 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work label Jun 15, 2023
@zackkrida zackkrida added 🟥 priority: critical Must be addressed ASAP 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository 🧱 stack: mgmt Related to repo management and automations and removed 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work labels Jun 15, 2023
@zackkrida zackkrida changed the title Add logging to the API dockerfile Fix API image builds Jun 15, 2023
Copy link
Collaborator

@AetherUnbound AetherUnbound left a comment

Choose a reason for hiding this comment

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

I confirmed that the image builds locally and that it generates audio waveforms correctly!

Copy link
Member

@krysal krysal left a comment

Choose a reason for hiding this comment

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

Great. I'll create an issue to move this out after resolving the critical issue.

python manage.py collectstatic
SETUP_ES="False" \
STATIC_ROOT="/static" \
DJANGO_SECRET_KEY="any string" \
Copy link
Member

Choose a reason for hiding this comment

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

Wondering why this is needed here 😶

Copy link
Collaborator

@stacimc stacimc left a comment

Choose a reason for hiding this comment

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

Looks good, all works locally 💯

@zackkrida zackkrida merged commit 69a87d7 into main Jun 15, 2023
@zackkrida zackkrida deleted the try-fix-api-builds branch June 15, 2023 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟥 priority: critical Must be addressed ASAP 🧱 stack: api Related to the Django API 🧱 stack: mgmt Related to repo management and automations
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

API Docker Images are failing to build
5 participants