Merge pull request #43 from chrisburr/diraccommon

chore: base depends on diraccommon instead of dirac

Author: chrisburr

base/Dockerfile

@@ -1,14 +1,14 @@
 FROM mambaorg/micromamba:latest
 
 # Copying in ENTRYPOINT script and environment specification
-COPY --chown=$MAMBA_USER:$MAMBA_USER environment.yml dirac_dependencies.yml /tmp/
+COPY --chown=$MAMBA_USER:$MAMBA_USER environment.yml diraccommon_dependencies.yml /tmp/
 COPY --chown=$MAMBA_USER:$MAMBA_USER entrypoint.sh /
 RUN chmod 755 /entrypoint.sh
 
 RUN micromamba install --freeze-installed --yes --file /tmp/environment.yml  --name=base && \
-    micromamba install --freeze-installed --yes --file /tmp/dirac_dependencies.yml --name=base && \
+    micromamba install --freeze-installed --yes --file /tmp/diraccommon_dependencies.yml --name=base && \
     micromamba clean --all --yes --force-pkgs-dirs && \
-    rm -rf /tmp/environment.yml /tmp/dirac_dependencies.yml
+    rm -rf /tmp/environment.yml /tmp/diraccommon_dependencies.yml
 
 ARG MAMBA_DOCKERFILE_ACTIVATE=1
 

base/dirac_dependencies.yml base/diraccommon_dependencies.ymlbase/dirac_dependencies.yml renamed to base/diraccommon_dependencies.yml

@@ -6,35 +6,9 @@
 
 name: diracx
 channels:
-  - diracgrid
   - conda-forge
   - nodefaults
 dependencies:
-  - aiobotocore >=2.12
-  - authlib
-  - boto3
-  - botocore
-  - cwltool
-  - db12
+  - typing-extensions >=4.0.0
   - diraccfg
-  - dominate
-  - fts3
-  - importlib-metadata
-  - joserfc
-  - m2crypto >=0.38.0
-  - packaging
-  - pexpect
-  - prompt-toolkit
-  - psutil
-  - pyasn1-modules
-  - pyparsing
-  - python-gfal2
-  - pytz
-  - rucio-clients >=34.4.2
-  - sqlalchemy
-  - pyjwt
-  # For diracx-client
-  - azure-core
-  - isodate
-  - requests
-  - xattr
+  - pydantic >=2.0.0