Merge remote-tracking branch 'origin/maven/fixes/7.0' into maven/rele…

…ase/7.0

.gitignore

@@ -1,11 +1,13 @@
 #php
 config.php
-php/src/tools/onlyoffice/storage
-!php/src/tools/onlyoffice/storage/templates
-assets/private.key
-assets/public.key
+service/src/main/php/data/
+service/src/main/php/src/tools/onlyoffice/storage
+!service/src/main/php/src/tools/onlyoffice/storage/templates
+service/src/main/assets/private.key
+service/src/main/assets/public.key
 composer.phar
-php/composer.lock
+composer.lock
+composerinstaller.php
 vendor
 log
 !log/.gitkeep
@@ -33,4 +35,4 @@ buildNumber.properties
 THIRD-PARTY*.txt
 
 # Dotenv
-.env
+.env

deploy/docker/compose/src/main/compose/1_connector-common.yml

@@ -26,7 +26,7 @@ services:
       DATABASE_USER: "${SERVICES_EDU_CONNECTOR_DATABASE_USER:-connector}"
       DATABASE_PASSWORD: "${SERVICES_EDU_CONNECTOR_DATABASE_PASS:-connector}"
     volumes:
-      - "services-edu-connector-data:/var/www/html/data"
+      - "services-edu-connector-data:/var/data"
     depends_on:
       - services-edu-connector-database
     ports:

deploy/docker/compose/src/main/compose/1_connector-dev.yml

@@ -4,7 +4,10 @@ services:
 
   services-edu-connector-service:
     volumes:
-      - "${GIT_ROOT}/services-connector/service/src/main/php/vendor:/var/www/html/vendor"
+      - type: bind
+        source: ${GIT_ROOT}/services-connector/service/src/main/php/vendor
+        target: /var/www/html/vendor
+
       - "${GIT_ROOT}/services-connector/service/src/main/php/:/var/www/html/"
 
 #      - "${GIT_ROOT}/services-connector/service/src/main/php/:/var/www/html/"

service/Dockerfile

@@ -38,6 +38,8 @@ ARG project_version=dev
 
 ENV PATH /application/bin:$PATH
 ENV ROOT /var/www/html
+ENV DATA /var/data
+
 WORKDIR $ROOT
 
 COPY --from=builder /var/www/html/css/ css/
@@ -64,8 +66,8 @@ RUN set -eux \
 
 
 RUN set -eux \
-    && mkdir data \
-    && chown -R www-data:www-data data
+    && mkdir $DATA \
+    && chown -R www-data:www-data $DATA
 
 ########################################################################################################################
 
@@ -82,7 +84,7 @@ RUN set -eux \
     && adduser www-data appuser
 
 RUN set -eux \
-	&& chown -R appuser:appuser /etc/apache2 $ROOT
+	&& chown -R appuser:appuser /etc/apache2 $ROOT $DATA
 
 USER appuser
 

service/pom.xml

@@ -61,4 +61,41 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>dev</id>
+
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>env.DEV</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>uk.co.codezen</groupId>
+            <artifactId>composer-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>install</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <phpPath>php</phpPath>
+                  <composerJsonPath>${project.basedir}/src/main/php/composer.json</composerJsonPath>
+                  <buildDirectory>${project.basedir}/src/main/php</buildDirectory>
+                  <withDev>true</withDev>
+                  <withOptimisedAutoloader>false</withOptimisedAutoloader>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>

service/src/main/docker/entrypoint.sh

@@ -20,9 +20,9 @@ connector_database_port=${DATABASE_PORT//\/&/\\&}
 connector_database_user=${DATABASE_USER//\/&/\\&}
 connector_database_password=${DATABASE_PASSWORD//\/&/\\&}
 connector_database_name=${DATABASE_NAME//\/&/\\&}
-
 connector_database_path=${connector_database_host}:${connector_database_port}
 
+
 # OPTIONALS
 
 only_office_document_server="${ONLYOFFICE_DOCUMENT_SERVER:-}"
@@ -35,8 +35,8 @@ moodle_base_dir="${MOODLE_BASE_DIR:-}"
 moodle_token="${MOODLE_TOKEN:-}"
 
 sed -i "s|define('WWWURL', '.*')|define('WWWURL', '${connector_url}')|g" "${conf}"
-sed -i "s|define('DOCROOT', '.*')|define('DOCROOT', '\/var\/www\/html')|g" "${conf}"
-sed -i "s|define('DATA', '.*')|define('DATA', '\/var\/www\/html\/data')|g" "${conf}"
+sed -i "s|define('DOCROOT', '.*')|define('DOCROOT', '${ROOT}')|g" "${conf}"
+sed -i "s|define('DATA', '.*')|define('DATA', '${DATA}')|g" "${conf}"
 sed -i "s|define('LOG_MODE', '.*')|define('LOG_MODE', 'stdout')|g" "${conf}"
 sed -i "s|define('DBHOST', '.*')|define('DBHOST', '${connector_database_path}')|g" "${conf}"
 sed -i "s|define('DBUSER', '.*')|define('DBUSER', '${connector_database_user}')|g" "${conf}"