diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final | 8 | ||||
| -rw-r--r-- | packages/pom.xml | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final index 8238923139..f471caa340 100644 --- a/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final +++ b/packages/docker/src/main/docker/docker-files/Dockerfile.mso-chef-final @@ -82,10 +82,10 @@ COPY ./maven/artifacts/* $JBOSS_HOME/standalone/deployments/ RUN mkdir -p /etc/mso/config.d/ASDC && chown -R jboss:jboss /etc/mso/config.d/ASDC && chmod u+xrw /etc/mso/config.d/ASDC ## Install heatbridge -RUN apt-get install -y python && apt-get install -y python-pip && echo 'PIP Installed, doing upgrade' && pip install --upgrade pip -RUN mkdir /opt/mso/heatbridge -COPY heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl /opt/mso/heatbridge -RUN pip install /opt/mso/heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl +#RUN apt-get install -y python && apt-get install -y python-pip && echo 'PIP Installed, doing upgrade' && pip install --upgrade pip +#RUN mkdir /opt/mso/heatbridge +#COPY heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl /opt/mso/heatbridge +#RUN pip install /opt/mso/heatbridge/heatbridge-0.3.0.dev0-py2-none-any.whl ### Open Ports EXPOSE 8080 diff --git a/packages/pom.xml b/packages/pom.xml index e632f82d62..40a9b6efb6 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -26,12 +26,17 @@ </modules>
</profile>
+ <!-- Those profile are exclusive, choose docker or with-integration-tests -->
<profile>
<id>docker</id>
<modules>
<module>deliveries</module>
<module>docker</module>
</modules>
+ <properties>
+ <!-- For this profile we probably don't want to skip the docker push (if deploy goal is specified) -->
+ <docker.skip.push>false</docker.skip.push>
+ </properties>
</profile>
<profile>
@@ -41,6 +46,10 @@ <module>docker</module>
<module>arquillian-unit-tests</module>
</modules>
+ <properties>
+ <!-- For this profile we want to skip the docker push (if deploy goal is specified) -->
+ <docker.skip.push>true</docker.skip.push>
+ </properties>
</profile>
</profiles>
|