inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

changes to address code review comments

Browse Source
This commit is contained in:
Rodica Sutu
2019-12-02 15:52:31 +02:00
parent 3885c4462c
commit 2629b65eb1
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-community/rm-community-repo/Dockerfile
View File

@@ -18,11 +18,10 @@ RUN mkdir /usr/local/tomcat/webapps/gs-api-explorer && cd /usr/local/tomcat/weba
jar -xvf /usr/local/tomcat/webapps/gs-api-explorer-*.war && rm -f /usr/local/tomcat/webapps/gs-api-explorer-*.war jar -xvf /usr/local/tomcat/webapps/gs-api-explorer-*.war && rm -f /usr/local/tomcat/webapps/gs-api-explorer-*.war
# All files in the tomcat folder must be owned by root user and Alfresco group as mentioned in the parent Dockerfile # All files in the tomcat folder must be owned by root user and Alfresco group as mentioned in the parent Dockerfile
RUN chgrp -R Alfresco /usr/local/tomcat/webapps && \ RUN chgrp -R Alfresco /usr/local/tomcat && \
find /usr/local/tomcat/webapps -type d -exec chmod 0750 {} \; && \ find /usr/local/tomcat/webapps -type d -exec chmod 0750 {} \; && \
find /usr/local/tomcat/webapps -type f -exec chmod 0640 {} \; && \ find /usr/local/tomcat/webapps -type f -exec chmod 0640 {} \; && \
chmod -R g+r /usr/local/tomcat/webapps && \ chmod -R g+r /usr/local/tomcat/webapps
chgrp -R Alfresco /usr/local/tomcat
# Switching back to alfresco user after having added amps files to run the container as non-root # Switching back to alfresco user after having added amps files to run the container as non-root
USER alfresco USER alfresco

11
rm-community/rm-community-repo/docker-compose.yml
View File

@@ -22,7 +22,9 @@ services:
-Dindex.subsystem.name=solr6 -Dindex.subsystem.name=solr6
-Dalfresco.restApi.basicAuthScheme=true -Dalfresco.restApi.basicAuthScheme=true
-Dimap.server.enabled=true -Dimap.server.enabled=true
-Dimap.server.port=1143
-Dftp.enabled=true -Dftp.enabled=true
-Dftp.port=1221
-Dftp.dataPortFrom=30000 -Dftp.dataPortFrom=30000
-Dftp.dataPortTo=30099 -Dftp.dataPortTo=30099
-Dshare.host=localhost -Dshare.host=localhost
@@ -42,17 +44,12 @@ services:
-Dimg.url=http://imagemagick:8090/ -Dimg.url=http://imagemagick:8090/
-Dtika.url=http://tika:8090/ -Dtika.url=http://tika:8090/
-Dtransform.misc.url=http://transform-misc:8090/ -Dtransform.misc.url=http://transform-misc:8090/
-Dimap.server.port=1143
-Dftp.port=1221
-Dcors.enabled=true
-Dcors.allowed.origins=http://localhost:4200
" "
ports: ports:
- 8080:8080 - 8080:8080
- 8000:8000 - 8000:8000
- 143:1143 - 1143:1143
- "21:21" - "21:1221"
- "30000-30099:30000-30099" - "30000-30099:30000-30099"
alfresco-pdf-renderer: alfresco-pdf-renderer:

1
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/version/DeclareAsRecordVersionTest.java
View File

@@ -36,7 +36,6 @@ import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService; import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService;
import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionServiceImpl; import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionServiceImpl;
import org.alfresco.repo.version.VersionModel; import org.alfresco.repo.version.VersionModel;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.version.Version; import org.alfresco.service.cmr.version.Version;
import org.alfresco.service.cmr.version.VersionType; import org.alfresco.service.cmr.version.VersionType;