This is an automated email from the ASF dual-hosted git repository. eamonford pushed a commit to branch dockerize_collection_ingester in repository https://gitbox.apache.org/repos/asf/incubator-sdap-ingester.git
commit 6a89f772355ad497f9b6481f5e971220f8dd5ba4 Author: Eamon Ford <[email protected]> AuthorDate: Mon Jun 22 11:34:27 2020 -0700 dockerfile --- collection_manager/containers/docker/Dockerfile | 11 ++++++++--- collection_manager/containers/docker/entrypoint.sh | 10 ++++++++++ collection_manager/setup.py | 8 +++----- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/collection_manager/containers/docker/Dockerfile b/collection_manager/containers/docker/Dockerfile index 3ba8da7..fcd3aa3 100644 --- a/collection_manager/containers/docker/Dockerfile +++ b/collection_manager/containers/docker/Dockerfile @@ -1,11 +1,16 @@ FROM python:3 -# Add kubernetes client to create other pods (ingester) RUN apt-get update && apt-get install -y apt-transport-https gnupg2 RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - RUN echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | tee -a /etc/apt/sources.list.d/kubernetes.list RUN apt-get update && apt-get install -y kubectl -RUN pip install https://github.com/tloubrieu-jpl/incubator-sdap-nexus-ingestion-manager/releases/download/0.4.0+dev/sdap_ingest_manager-0.4.0+dev-py3-none-any.whl +COPY /collection_manager /collection_manager/collection_manager +COPY /setup.py /collection_manager/setup.py +COPY /requirements.txt /collection_manager/requirements.txt +COPY /README.md /collection_manager/README.md +COPY /containers/docker/entrypoint.sh /entrypoint.sh -CMD bash +RUN cd /collection_manager && python setup.py install + +ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] diff --git a/collection_manager/containers/docker/entrypoint.sh b/collection_manager/containers/docker/entrypoint.sh new file mode 100644 index 0000000..eb88f75 --- /dev/null +++ b/collection_manager/containers/docker/entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +python /collection_manager/collection_manager/main.py \ + $([[ ! -z "$COLLECTIONS_PATH" ]] && echo --collections-path=$COLLECTIONS_PATH) \ + $([[ ! -z "$RABBITMQ_HOST" ]] && echo --rabbitmq-host=$RABBITMQ_HOST) \ + $([[ ! -z "$RABBITMQ_USERNAME" ]] && echo --rabbitmq-username=$RABBITMQ_USERNAME) \ + $([[ ! -z "$RABBITMQ_PASSWORD" ]] && echo --rabbitmq-password=$RABBITMQ_PASSWORD) \ + $([[ ! -z "$RABBITMQ_QUEUE" ]] && echo --rabbitmq-queue=$RABBITMQ_QUEUE) \ + $([[ ! -z "$HISTORY_URL" ]] && echo --history-url=$HISTORY_URL) \ + $([[ ! -z "$HISTORY_PATH" ]] && echo --history-path=$HISTORY_PATH) diff --git a/collection_manager/setup.py b/collection_manager/setup.py index 49b0d75..1542486 100644 --- a/collection_manager/setup.py +++ b/collection_manager/setup.py @@ -1,9 +1,7 @@ -import setuptools -import os -import subprocess -import sys import re +import setuptools + PACKAGE_NAME = "sdap_collection_manager" with open("./collection_manager/__init__.py") as fi: @@ -24,7 +22,7 @@ setuptools.setup( description="a helper to ingest data in sdap", long_description=long_description, long_description_content_type="text/markdown", - url="https://github.com/tloubrieu-jpl/incubator-sdap-nexus-ingestion-manager";, + url="https://github.com/apache/incubator-sdap-ingester";, packages=setuptools.find_packages(), classifiers=[ "Programming Language :: Python :: 3",
