diff --git a/Dockerfile b/Dockerfile index 8af6868..11bd334 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,44 +1,45 @@ FROM python:3.6 RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && apt-get upgrade -y && \ apt-get install -y \ libapr1-dev \ libaprutil1-dev \ libpq-dev \ libsvn-dev \ libsystemd-dev \ postgresql-client \ wait-for-it \ ngrep && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* RUN useradd -md /srv/softwareheritage -s /bin/bash swh USER swh RUN python3 -m venv /srv/softwareheritage/venv ENV PATH="/srv/softwareheritage/venv/bin:${PATH}" RUN pip install --upgrade pip setuptools wheel RUN pip install gunicorn RUN pip install \ swh-deposit \ swh-indexer \ swh-journal \ swh-lister \ swh-loader-debian \ swh-loader-dir \ swh-loader-git \ swh-loader-mercurial \ + swh-loader-npm \ swh-loader-pypi \ swh-loader-svn \ swh-loader-tar \ swh-storage \ swh-objstorage \ swh-scheduler \ swh-vault \ swh-web COPY utils/*.sh /srv/softwareheritage/utils/ RUN mkdir -p /srv/softwareheritage/objects diff --git a/conf/loader.yml b/conf/loader.yml index 22a326d..6d8f61d 100644 --- a/conf/loader.yml +++ b/conf/loader.yml @@ -1,29 +1,32 @@ storage: cls: remote args: url: http://swh-storage:5002/ celery: task_broker: amqp://guest:guest@amqp// task_modules: - swh.loader.debian.tasks - swh.loader.dir.tasks - swh.loader.git.tasks - swh.loader.mercurial.tasks + - swh.loader.npm.tasks - swh.loader.pypi.tasks - swh.loader.svn.tasks - swh.loader.tar.tasks + task_queues: - swh.loader.debian.tasks.LoadDebianPackage - swh.loader.dir.tasks.LoadDirRepository - swh.loader.git.tasks.LoadDiskGitRepository - swh.loader.git.tasks.UncompressAndLoadDiskGitRepository - swh.loader.git.tasks.UpdateGitRepository - swh.loader.mercurial.tasks.LoadArchiveMercurial - swh.loader.mercurial.tasks.LoadMercurial + - swh.loader.npm.tasks.LoadNpm - swh.loader.pypi.tasks.LoadPyPI - swh.loader.svn.tasks.DumpMountAndLoadSvnRepository - swh.loader.svn.tasks.LoadSvnRepository - swh.loader.svn.tasks.MountAndLoadSvnRepository - swh.loader.tar.tasks.LoadTarRepository lister_db_url: postgresql://postgres@swh-listers-db/swh-listers