diff options
Diffstat (limited to 'installation/dgbuilder')
| -rw-r--r-- | installation/dgbuilder/pom.xml | 37 | ||||
| -rw-r--r-- | installation/dgbuilder/src/main/docker/Dockerfile | 6 |
2 files changed, 23 insertions, 20 deletions
diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index daef9865..f7a6375d 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -18,7 +18,7 @@ <description>Creates docker container for dgbuilder</description> <properties> - <image.name>ecomp/dgbuilder-sdnc-image</image.name> + <image.name>openecomp/dgbuilder-sdnc-image</image.name> </properties> @@ -51,7 +51,7 @@ <executions> <execution> <id>generate-images</id> - <phase>process-sources</phase> + <phase>generate-sources</phase> <goals> <goal>build</goal> </goals> @@ -98,20 +98,21 @@ <groupId>org.codehaus.mojo</groupId> <version>1.5.0</version> <executions> - <execution> - <id>make-path</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/bin/mkdir</executable> - <arguments> - <argument>-p</argument> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> - </arguments> - </configuration> - </execution> + <execution> + <id>Unzip dgbuilder</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>/usr/bin/unzip</executable> + <arguments> + <argument>-d</argument> + <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument> + <argument>../../dgbuilder/target/*.zip</argument> + </arguments> + </configuration> + </execution> <execution> <id>Copy dgbuilder</id> <phase>generate-sources</phase> @@ -137,7 +138,7 @@ <configuration> <executable>/bin/bash</executable> <arguments> - <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir</argument> + <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir.sh</argument> <argument>1702</argument> <argument>dguser</argument> <argument>change_email_id@dgbuilder.com</argument> @@ -147,7 +148,7 @@ <execution> <id>change shell permissions</id> - <phase>process-sources</phase> + <phase>process-sources</phase> <goals> <goal>exec</goal> </goals> diff --git a/installation/dgbuilder/src/main/docker/Dockerfile b/installation/dgbuilder/src/main/docker/Dockerfile index fd91e773..f3c0e815 100644 --- a/installation/dgbuilder/src/main/docker/Dockerfile +++ b/installation/dgbuilder/src/main/docker/Dockerfile @@ -1,11 +1,13 @@ # Base ubuntu with added packages needed for open ecomp -FROM ecomp/ubuntu-sdnc-image:${project.version} +FROM openecomp/ubuntu-sdnc-image:${project.version} MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) # copy openecomp COPY opt /opt WORKDIR /opt/openecomp/sdnc/dgbuilder -RUN npm install +# Set the proxy if needed +# RUN npm config set proxy http://your.proxy.com:8080 +#RUN npm install #ENTRYPOINT /bin/bash /opt/openecomp/sdnc/dgbuilder/start sdnc1.0 EXPOSE 3100 |