Merge branch 'docker-container' into 'master'

Docker ympäristöä

See merge request !437

code/pom.xml

@@ -54,10 +54,10 @@
 		<payara.version>4.1.2.181</payara.version>
 		<payara.version>4.1.2.181</payara.version>
 	</properties>
 	</properties>
 
 
-	<url>http://codecrew.fi</url>
+	<url>https://codecrew.fi</url>
 	<organization>
 	<organization>
 		<name>Codecrew RY</name>
 		<name>Codecrew RY</name>
-		<url>http://codecrew.fi</url>
+		<url>https://codecrew.fi</url>
 	</organization>
 	</organization>
 	<scm>
 	<scm>
 		<connection>scm:git:https://gitlab.codecrew.fi/codecrew/moya.git</connection>
 		<connection>scm:git:https://gitlab.codecrew.fi/codecrew/moya.git</connection>

docker/.env

+COMPOSE_PROJECT_NAME=moya
+POSTGRES_PASSWORD=asdfasdewSDFdfasdf
+POSTGRES_USER=moya
+POSTGRES_DB=moya

docker/README.md

+
+
+# Restoring postgresql -backup
+
+```
+pg_restore -c -U moya -d moya -h 127.0.0.1 -p 6432  -v "moya_db.tar" -W
+```
+Copy password from .env -file.
+
+# notes
+
+* 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
+
+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/

docker/docker-compose.yml

+version: "2.4"
+services:
+  db:
+    image: postgres
+    restart: always
+    environment:
+      - POSTGRES_PASSWORD
+      - POSTGRES_USER
+      - POSTGRES_DB
+#    entrypoint: "docker-entrypoint.sh"
+    command: postgres -c max_prepared_transactions=10
+    ports:
+      - "127.0.0.1:6432:5432"
+  payara:
+    build: payara
+    environment:
+      - POSTGRES_USER
+      - POSTGRES_PASSWORD
+      - DB_URL=jdbc:postgresql://db:5432/${POSTGRES_DB}
+    ports:
+      - "127.0.0.1:8080:8080"
+      - "127.0.0.1:4848:4848"
+  maven:
+    image: maven:3.8.5-jdk-8
+    entrypoint: "/bin/bash"
+    tty: true
+    working_dir: /usr/src/moya/moya-parent
+    volumes:
+      - ../:/usr/src/moya
+      - ~/.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/payara/Dockerfile

+FROM payara/server-full:4.181
+
+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/

docker/payara/mkconf.sh

+#!/bin/sh -e
+
+> ${POSTBOOT_COMMANDS} tr -d '\t' <<-EOF
+	create-jdbc-connection-pool \
+		--datasourceclassname=org.postgresql.xa.PGXADataSource \
+		--restype=javax.sql.XADataSource \
+		--property \
+			URL='${DB_URL}':\
+			Password='${POSTGRES_PASSWORD}':\
+			User='${POSTGRES_USER}' \
+		MoyaPool
+	create-jdbc-resource \
+		--connectionpoolid MoyaPool \
+		jdbc/moyaDb
+	create-auth-realm \
+		--classname fi.codecrew.moya.MoyaRealm \
+		--property \
+			jaas-context=moyaRealm \
+		moyaRealm
+	create-javamail-resource \
+		--mailhost=dummyhost \
+		--mailuser=bortalmail \
+		--fromaddress=bortalmail@codecrew.fi \
+		--enabled=true --description='Bortal'"' \
+		--storeprotocol=imap \
+		--storeprotocolclass=com.sun.mail.imap.IMAPStore \
+		--transprotocol smtp \
+		--transprotocolclass com.sun.mail.smtp.SMTPTransport \
+		--property mail.smtp.port=587 \
+		mail/moya
+	create-jms-resource --restype \
+		javax.jms.QueueConnectionFactory \
+	jms/moyaMailQueueFactory
+	create-jms-resource --restype javax.jms.Queue \
+		--property Name=MoyaMailQueue \
+	jms/moyaMailQueue
+	set server-config.security-service.activate-default-principal-to-role-mapping=true
+	create-custom-resource --restype java.lang.String \
+		--factoryclass com.sun.faces.application.ProjectStageJndiFactory \
+	--property stage=Development javax.faces.PROJECT_STAGE
+EOF
+
+>> ${PAYARA_PATH}/glassfish/domains/${PAYARA_DOMAIN}/config/login.conf sed 's/.//' <<EOF
+	moyaRealm {
+		fi.codecrew.moya.MoyaLoginModule required;
+	};
+EOF

docker/payara/moya.patch

+--- a/generate_deploy_commands.sh
++++ b/generate_deploy_commands.sh
+@@ -18,6 +18,30 @@
+ # a single application exists in the $DEPLOY_DIR directory.
+ ################################################################################
+ 
++if ls ${PAYARA_PATH}/glassfish/domains/${PAYARA_DOMAIN}/applications \
++    2>/dev/null | grep -qv '^__internal$'
++  then
++    > ${POSTBOOT_COMMANDS}
++else
++    if [ -x ${PAYARA_PATH}/bin/mkconf.sh ]
++      then
++        ${PAYARA_PATH}/bin/mkconf.sh
++    fi
++fi
++
++allapps=$(find "${DEPLOY_DIR}" -maxdepth 1 -type f \
++  \( -iname '*.ear' -or -iname '*.jar' -or -iname '*.war' \))
++
++CHECKSUMS=/tmp/sha512sums
++
++if [ -e $CHECKSUMS ]
++  then
++    apps=$(sha512sum -c $CHECKSUMS 2>/dev/null \
++      | grep ': FAILED$' | sed 's/: FAILED$//')
++else
++    apps=${allapps}
++fi
++
+ if [ x$1 != x ]
+   then
+     DEPLOY_OPTS="$*"
+@@ -24,7 +48,12 @@
+ fi
+ 
+ echo '# deployments after boot' >> $POSTBOOT_COMMANDS
+-for deployment in "${DEPLOY_DIR}"/*
++for deployment in ${apps}
+   do
+     echo "deploy --force --enabled=true $DEPLOY_OPTS $deployment" >> $POSTBOOT_COMMANDS
+ done
++
++if [ "x${apps}" != "x" ]
++  then
++    sha512sum ${allapps} > $CHECKSUMS
++fi