Skip to content

Commit

Permalink
Fixing docker registry implementation in conda-store (#368)
Browse files Browse the repository at this point in the history
  • Loading branch information
costrouc authored Aug 4, 2022
1 parent f7607f4 commit 09f2b7f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions conda-store-server/conda_store_server/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,8 +256,8 @@ def _default_celery_results_backend(self):
)

default_docker_base_image = Unicode(
"frolvlad/alpine-glibc:latest",
help="default base image used for the Dockerized environments",
"library/debian:sid-slim",
help="default base image used for the Dockerized environments. Make sure to have a proper glibc within image.",
config=True,
)

Expand Down
2 changes: 1 addition & 1 deletion conda-store-server/conda_store_server/schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def _datetime_factory(offset: datetime.timedelta):

# namespace and name cannot contain "*" ":" "#" " " "/"
# this is a more restrictive list
ALLOWED_CHARACTERS = "A-Za-z0-9-+_=@$&?^|~."
ALLOWED_CHARACTERS = "A-Za-z0-9-+_@$&?^~.="
ARN_ALLOWED = f"^([{ALLOWED_CHARACTERS}*]+)/([{ALLOWED_CHARACTERS}*]+)$"


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def replace_words(s, words):

# TODO: should really be doing checking on package names to
# validate user input
packages = [replace_words(_, constraint_mapper) for _ in sorted(packages)]
environment_name = "|".join(packages)
package_specs = [replace_words(_, constraint_mapper) for _ in sorted(packages)]
environment_name = "-".join(packages)
environment = api.get_environment(
conda_store.db, environment_name, namespace="conda-store-dynamic"
)
Expand All @@ -60,7 +60,7 @@ def replace_words(s, words):
environment_specification = {
"name": environment_name,
"channels": ["conda-forge"],
"dependencies": packages,
"dependencies": package_specs,
}
conda_store.register_environment(
environment_specification, namespace="conda-store-dynamic"
Expand Down Expand Up @@ -128,7 +128,7 @@ def v2():
return _json_response({})


@router_registry.get("/v2/<rest:path>")
@router_registry.get("/v2/{rest:path}")
def list_tags(
rest: str,
conda_store=Depends(dependencies.get_conda_store),
Expand Down
2 changes: 1 addition & 1 deletion conda-store-server/environment-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
# conda builds
- conda
- conda-docker
- conda-docker >= 0.1.1
- conda-pack
- conda-lock >=1.0.5
# web server
Expand Down
2 changes: 1 addition & 1 deletion conda-store-server/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
dependencies:
# conda environment builds
- conda
- conda-docker
- conda-docker >= 0.1.1
- conda-pack
- conda-lock >=1.0.5
# web server
Expand Down
2 changes: 1 addition & 1 deletion docs/administration.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ docker builds of Conda environments. This package at a minimum should
have the [following packages
installed](https://docs.anaconda.com/anaconda/install/linux/). Often
times for non-graphic and non-gpu environments glibc is enough. Hence
the default docker image `frolvlad/alpine-glibc:latest`.
the default docker image `library/debian:sid-slim`.

`CondaStore.serialize_builds` no longer build Conda environment in
parallel. This is due to an issue in Conda/Mamba that when downloading
Expand Down

0 comments on commit 09f2b7f

Please sign in to comment.