diff options
| -rw-r--r-- | conductor/assembly.xml | 2 | ||||
| -rw-r--r-- | conductor/docker/Dockerfile | 17 | ||||
| -rw-r--r-- | conductor/docker/assembly/has-files.xml | 2 |
3 files changed, 9 insertions, 12 deletions
diff --git a/conductor/assembly.xml b/conductor/assembly.xml index f1ce62d..9af0590 100644 --- a/conductor/assembly.xml +++ b/conductor/assembly.xml @@ -15,7 +15,7 @@ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> <id>conductor</id> <formats> - <format>zip</format> + <format>dir</format> </formats> <fileSets> <fileSet> diff --git a/conductor/docker/Dockerfile b/conductor/docker/Dockerfile index 167aa11..be6e4ec 100644 --- a/conductor/docker/Dockerfile +++ b/conductor/docker/Dockerfile @@ -39,21 +39,18 @@ RUN mkdir -p /etc/nginx/ssl && \ mkdir -p /run/conductor # Install the required libraries -RUN apk --update add unzip && \ - apk add curl && \ - apk add wget && \ - apk add fcgiwrap && \ - apk add bash vim && \ - pip install --no-cache-dir --upgrade pip && \ +RUN pip install --no-cache-dir --upgrade pip && \ apk add --virtual build-dependencies build-base linux-headers pcre-dev libffi-dev libxslt-dev openssl-dev && \ pip install --no-cache-dir uwsgi -# Get, Install, cleanup and setup -COPY onap-has-tm/optf-has-conductor-${MVN_ARTIFACT_VERSION}.zip /tmp/optf-has.zip -RUN unzip -q -o -B /tmp/optf-has.zip -d /opt/has && rm -f /tmp/optf-has.zip - ENV CRYPTOGRAPHY_DONT_BUILD_RUST "1" +COPY onap-has-tm/optf-has-conductor-${MVN_ARTIFACT_VERSION}/conductor/requirements.txt /tmp +RUN pip install --no-cache-dir -r /tmp/requirements.txt + +# Get, Install, cleanup and setup +COPY onap-has-tm/optf-has-conductor-${MVN_ARTIFACT_VERSION} /opt/has + #PKG-INFO file must also exists in the conductor folder (i.e. besides and inside the of_has.egg-info folder). The zip file for distro above is missing it RUN cp /opt/has/conductor/of_has.egg-info/PKG-INFO /opt/has/conductor RUN pip install --no-cache-dir -e /opt/has/conductor diff --git a/conductor/docker/assembly/has-files.xml b/conductor/docker/assembly/has-files.xml index 9590740..f190725 100644 --- a/conductor/docker/assembly/has-files.xml +++ b/conductor/docker/assembly/has-files.xml @@ -46,7 +46,7 @@ <fileSets> <fileSet> <includes> - <include>${project.build.finalName}.zip</include> + <include>${project.build.finalName}/**</include> </includes> <directory>${project.build.directory}</directory> <outputDirectory>/</outputDirectory> |