Skip to content

Commit

Permalink
Cherrypicked (and Squashed) Dockerfile modifications.
Browse files Browse the repository at this point in the history
renamed (duh!)
(cherry picked from commit 574a76a)

Finalized first version of Docker,
Maven filters it into target, to build image:
1) mvn install
2) cd target && docker build ./ (...)
(cherry picked from commit 699b725)

fix.
(cherry picked from commit 5afe547)

Removed ls,
added possibly needed chmod.
(cherry picked from commit 7c6d444)
  • Loading branch information
amedranogil committed Nov 16, 2018
1 parent 049f683 commit c51648f
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 10 deletions.
34 changes: 27 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,22 @@
<goal>resources</goal>
</goals>
</execution>
<execution>
<id>copy-docker</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target</outputDirectory>
<resources>
<resource>
<directory>src/main/docker</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand All @@ -201,14 +217,18 @@
<feature>uAAL-MW</feature>
</bootFeatures>
<!-- <installedFeatures/> -->
<installedFeatures>
<feature>uAAL-Ont.PhWorld</feature>
<feature>uAAL-Ont.Device</feature>
<feature>uAAL-Ont.CHe</feature>
<feature>uAAL-Ont.Profile</feature>
</installedFeatures>
<installedFeatures>
<feature>uAAL-Ont.PhWorld</feature>
<feature>uAAL-Ont.Device</feature>
<feature>uAAL-Ont.CHe</feature>
<feature>uAAL-Ont.Profile</feature>
</installedFeatures>
</configuration>
</plugin>
</plugin>
<!-- TODO look into maven-docker plugins to automatically build and deploy docker.
https://dmp.fabric8.io/
https://github.com/spotify/docker-maven-plugin
-->
</plugins>
</build>

Expand Down
9 changes: 6 additions & 3 deletions src/main/docker/Dokerfile → src/main/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ LABEL maintainer="[email protected]"
#ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64

RUN mkdir /uAAL
COPY ../../../target/assembly/* /uAAL/
COPY assembly/ /uAAL/

#RUN ls -lha /uAAL/
#RUN chmod +x /uAAL/bin

VOLUME ["/uAAL/data"]
VOLUME ["/uAAL/etc"]
Expand All @@ -13,6 +16,6 @@ EXPOSE 8081 9000
#TODO expose uAAL discovering and peering ports
#EXPOSE 1099 8101 44444 # Karaf ports

sed -i "21s/out/stdout/" /uAAL/etc/org.ops4j.pax.logging.cfg;
RUN sed -i "21s/out/stdout/" /uAAL/etc/org.ops4j.pax.logging.cfg;

CMD ["/uAAL/bin/karaf"]
CMD ["/uAAL/bin/karaf"]

0 comments on commit c51648f

Please sign in to comment.