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

chore(Dockerfile): add local dev env target (PROJQUAY-2501) #883

Merged
merged 1 commit into from
Sep 17, 2021

Conversation

flavianmissi
Copy link
Contributor

@flavianmissi flavianmissi commented Sep 8, 2021

To run a local development environment we currently use docker-compose with the custom local-dev/Dockerfile.
For better reuse of the improvements made to Dockerfile, the specific bits of local-dev/Dockerfile have been moved to Dockerfile as a build stage called local-dev-env, and local-dev/Dockerfile has been removed. This change also ensures that future improvements to Dockerfile will automatically be reused in our local dev envs.

NOTE: setuptools version had to be pinned to 57.5.0. Versions >=58 break the installation of funcparserlib fixed in #885

@app-sre-bot
Copy link
Collaborator

Can one of the admins verify this patch?

context: .
dockerfile: ./local-dev/Dockerfile
target: local-dev-env
Copy link
Member

Choose a reason for hiding this comment

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

Oh, I didn't know you could stop at specific stage. That's neat.

kleesc
kleesc previously approved these changes Sep 15, 2021
@kleesc
Copy link
Member

kleesc commented Sep 15, 2021

@flavianmissi I think the commit check is not passing because the ticket is missing from your commit header (it's in the Github PR's title, but not in the actual git commit).

@flavianmissi
Copy link
Contributor Author

@flavianmissi I think the commit check is not passing because the ticket is missing from your commit header (it's in the Github PR's title, but not in the actual git commit).

Ooh that makes sense! I'll fix then merge. Thx for reviewing!

When specified, the new build target (aka stage) builds quay the way
local-dev/Dockerfile used to, using local-dev/config.yml as
configuration, and starting up only the necessary tools for development.
See docker-compose.yml services:quay:build:target for how it's used.

Production builds should not be affected since the new target is not
referenced from anywhere but the docker-compose.yml.
@flavianmissi
Copy link
Contributor Author

@kleesc I reworded the commit so all checks would pass but now I need another approval 😅

Copy link
Member

@kleesc kleesc left a comment

Choose a reason for hiding this comment

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

LGTM

@flavianmissi flavianmissi merged commit 0f7fdb7 into quay:master Sep 17, 2021
@flavianmissi flavianmissi deleted the local-dev-dockerfile branch September 17, 2021 11:18
crozzy pushed a commit to crozzy/quay that referenced this pull request Sep 17, 2021
…y#883)

When specified, the new build target (aka stage) builds quay the way
local-dev/Dockerfile used to, using local-dev/config.yml as
configuration, and starting up only the necessary tools for development.
See docker-compose.yml services:quay:build:target for how it's used.

Production builds should not be affected since the new target is not
referenced from anywhere but the docker-compose.yml.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants