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

DEV - Simplify Docker images #841

Merged
merged 20 commits into from
Jul 5, 2024

Conversation

trallard
Copy link
Collaborator

@trallard trallard commented Jul 3, 2024

This is a stack on top of #838

Description

This PR continues to simplify the development and test setup for conda-store

  • Removes unnecessary environment.yaml files (less files to keep in check/updated)
  • Simplifies and adds comments to Dockerfiles
  • Bumps the base image to [24.3.0-0](https://hub.docker.com/layers/condaforge/mambaforge/24.3.0-0/images/sha256-21f7908a6c984ae164cb51c8af71ef9901693630f4b744038e5df6ef968d9b05?context=explore)

Pull request checklist

  • Did you test this change locally?
  • Did you update the documentation (if required)?
  • Did you add/update relevant tests for this change (if required)?

Additional information

Since this stacks on another PR, some integration and unit tests might fail (and will be fixed in #838). For now, the important parts are :

  • Docker-related workflows, which are working.
  • Integration tests (conda-store and conda-store-server) - in the sense that the container should be building and docker compose up should be working (which it is)

I built the Docker images locally, then used these ones for docker-compose, and all seemed to work.

@trallard trallard added the area: dependencies 📦 Issues related to conda-store dependencies label Jul 3, 2024
Copy link

netlify bot commented Jul 3, 2024

Deploy Preview for conda-store canceled.

Name Link
🔨 Latest commit 0ad1dad
🔍 Latest deploy log https://app.netlify.com/sites/conda-store/deploys/66859d0ad99fd900084039d2

@trallard trallard changed the base branch from main to trallard/update-dev-environments July 3, 2024 18:50
@trallard trallard requested a review from peytondmurray July 3, 2024 18:52
@trallard trallard marked this pull request as ready for review July 3, 2024 18:53
@trallard trallard requested a review from jaimergp July 3, 2024 18:53
@trallard trallard marked this pull request as draft July 3, 2024 19:06
@trallard trallard marked this pull request as ready for review July 3, 2024 19:30
Copy link
Contributor

@peytondmurray peytondmurray left a comment

Choose a reason for hiding this comment

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

A few comments, but on the whole this looks like a great simplification. I'm glad you spotted those test files unnecessarily getting copied in, too.

.dockerignore Outdated Show resolved Hide resolved
conda-store-server/Dockerfile Show resolved Hide resolved
conda-store/environment.yaml Outdated Show resolved Hide resolved
conda-store-server/Dockerfile Outdated Show resolved Hide resolved
Copy link
Contributor

@peytondmurray peytondmurray left a comment

Choose a reason for hiding this comment

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

Thanks for clearing up the questions I had 🚢

@trallard trallard merged commit 0024672 into trallard/update-dev-environments Jul 5, 2024
12 of 13 checks passed
@trallard trallard deleted the trallard/clean-docker branch July 5, 2024 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: dependencies 📦 Issues related to conda-store dependencies needs: review 👀
Projects
Status: Done 💪🏾
Development

Successfully merging this pull request may close these issues.

2 participants