Merge branch 'docker-container' into 'master'

Docker container development

See merge request !440

code/moya-parent/pom.xml

@@ -17,7 +17,7 @@
 		<module>../moya-mgmt</module>
 		<module>../moya-mgmt</module>
 		<module>../moya-terminal-web</module>
 		<module>../moya-terminal-web</module>
 		<module>../moya-ear</module>
 		<module>../moya-ear</module>
-		<module>../moya-angular</module>
+		<!-- <module>../moya-angular</module> -->
 	</modules>
 	</modules>
 
 
 	<dependencies>
 	<dependencies>

docker/README.md

 
 
+# Notes & manual
 
 
-# Restoring postgresql -backup
+* Kääntäminen, mene maven-konttiin sisälle (docker-desctopista "CLI") ja aja siellä `mvn clean install`
+* http://localhost:8080/MoyaWeb/
+* payara: http://localhost:4848
+  * admin/admin
+
+
+# Maintaining containers
+## Making new database -dump
 
 
 ```
 ```
-pg_restore -c -U moya -d moya -h 127.0.0.1 -p 6432  -v "moya_db.tar" -W
+cd db
+pg_dump -U moya -d moya -h 127.0.0.1 -p 6432 -f moya_development_db.sql
 ```
 ```
-Copy password from .env -file.
 
 
-# notes
+Copy password from .env -file on this directory.
+
 
 
-* http://localhost:8080/MoyaWeb/
-* payara: http://localhost:4848
-  * admin/admin 
 
 
 
 
-* Kääntö, aja code -hakemistossa: `docker run -it --rm --name moya-maven -v "$(pwd)":/usr/src/moya -w /usr/src/moya/moya-parent maven:3.8.5-jdk-8 mvn clean install`

docker/db/Dockerfile

-FROM payara/server-full:4.181
+FROM postgres
 
 
-USER root
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends patch && \
-    rm -rf /var/lib/apt/lists/*
-USER payara
-COPY moya.patch /tmp/
-RUN cd ${PAYARA_PATH} && patch -p1 < /tmp/moya.patch
-
-COPY --chown=payara:payara mkconf.sh ${PAYARA_PATH}/bin/
-RUN chmod 755 ${PAYARA_PATH}/bin/mkconf.sh
-
-COPY --chown=payara:payara \
-    MoyaAuthModulev4.jar \
-    ${PAYARA_PATH}/glassfish/domains/${PAYARA_DOMAIN}/lib/
-COPY --chown=payara:payara \
-    postgresql-42.3.1.jar \
-    ${PAYARA_PATH}/glassfish/domains/${PAYARA_DOMAIN}/lib/ext/
+COPY moya_development_db.sql /docker-entrypoint-initdb.d/

docker/docker-compose.yml

 version: "2.4"
 version: "2.4"
 services:
 services:
   db:
   db:
-    image: postgres
+    build: db
     restart: always
     restart: always
     environment:
     environment:
       - POSTGRES_PASSWORD
       - POSTGRES_PASSWORD
@@ -21,16 +21,10 @@ services:
       - "127.0.0.1:8080:8080"
       - "127.0.0.1:8080:8080"
       - "127.0.0.1:4848:4848"
       - "127.0.0.1:4848:4848"
   maven:
   maven:
-    image: maven:3.8.5-jdk-8
+    build: maven
     entrypoint: "/bin/bash"
     entrypoint: "/bin/bash"
     tty: true
     tty: true
-    working_dir: /usr/src/moya/moya-parent
+    working_dir: /usr/src/moya/code/moya-parent
     volumes:
     volumes:
       - ../:/usr/src/moya
       - ../:/usr/src/moya
       - ~/.m2:/root/.m2
       - ~/.m2:/root/.m2
-
-
-      #    volumes:
-#      - ../code/fnl-backend/fnl-webparent/fnl-ear/target:/opt/payara41/deployments:ro
-#tail -F anything
-# "$(pwd)":/usr/src/moya -w /usr/src/moya/moya-parent

docker/maven/Dockerfile

+FROM gizmotronic/oracle-java
+
+RUN apt-get update
+RUN apt-get install -y maven