Skip to content

Commit

Permalink
REPO-4026 : Prepare for Community 6.1.2-ga release (#124)
Browse files Browse the repository at this point in the history 
Update CHANGELOG.md
simplify Dockerfile
  • Loading branch information
@Epurashu
Epurashu authored Jan 14, 2019
1 parent 1902bf9 commit 4fe1d0d
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 35 deletions.
51 changes: 47 additions & 4 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,57 @@
<h1> 6.1.N
<h1> Release Notes - Alfresco - Version Community Edition 201901 GA
</h1>
<h2>
New Features
</h2>
<ul>
<li>
ActiveMQ:
<h4>ActiveMQ:</h4>
Alfresco ActiveMQ Docker images: <a href='https://github.com/Alfresco/alfresco-docker-activemq'>GitHub Repo</a> <a href='https://hub.docker.com/r/alfresco/alfresco-activemq/'>DockerHub Repo</a><p>
</li>
<li>
<h4>Alfresco Benchmark Framework:</h4>
<p>The benchmark framework project provides a way to run highly scalable, easy-to-run Java-based load and benchmark tests on an Alfresco instance.</p>
<p>It comprises the following: <a href='https://github.com/Alfresco/alfresco-bm-manager'>Alfresco BM Manager</a> and Alfresco BM Drivers.</p>
<p>The currently provided drivers are:</p>
<ul>
<li><a href='https://github.com/Alfresco/alfresco-bm-load-data'>Alfresco Benchmark Load Data</a></li>
<li><a href='https://github.com/Alfresco/alfresco-bm-rest-api'>Alfresco Benchmark Rest Api</a></li>
<li><a href='https://github.com/Alfresco/alfresco-bm-load-users'>Alfresco Benchmark Load Users</a></li>
</ul>
</li>
<li>
<h4>Java 11 support</h4>
<p>ACS is now runnable with OpenJDK 11.0.1. It still remains compatible with JDK 1.8.</p>
</li>
</ul>
<h2> Bug
</h2>
<ul>
<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22049'>ALF-22049</a>] - Alfresco does not start
</li>
<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22041'>ALF-22041</a>] - EKS deployment - SOLR_ALFRESCO_HOST set to wrong host name
</li>
<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22031'>ALF-22031</a>] - REST API calls silently rollback after the returning a success status
</li>
<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21963'>ALF-21963</a>] - Workflow - backslash in nodeRef properties url.
</li>
<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21803'>ALF-21803</a>] - Unable to add users to sites whose 'short name' is a substring of 'site'
</li>
<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-21664'>ALF-21664</a>] - Exception on workflow image by REST API
</li>
<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-20854'>ALF-20854</a>] - webdav error opening Spanish Accent files
</li>
</ul>
<h2> Improvement
</h2>
<ul>
<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-3668'>REPO-3668</a>] - Renditions: Transform event consumer
</li>
<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-7'>REPO-7</a>] - Embed ActiveMQ in the Platform
</li>
<li>[<a href='https://issues.alfresco.com/jira/browse/REPO-1957'>REPO-1957</a>] - Transformations Improvement Plan
</li>
</ul>
<h2>
Deprecations
</h2>
Expand Down Expand Up @@ -88,5 +132,4 @@
</li>
<li>[<a href='https://issues.alfresco.com/jira/browse/ALF-22008'>ALF-22008</a>] - It is not possible to upload a document without versions using CMIS
</li>
</ul>
</ul>
10 changes: 2 additions & 8 deletions docker-alfresco/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ RUN touch /usr/local/tomcat/shared/classes/alfresco-global.properties
COPY target/war /usr/local/tomcat/webapps
COPY target/connector/* /usr/local/tomcat/lib/
COPY target/alfresco-mmt/* /usr/local/tomcat/alfresco-mmt/
RUN rm -rf /usr/local/tomcat/webapps/ROOT
COPY target/server-root/* /usr/local/tomcat/webapps
COPY target/vti-bin/* /usr/local/tomcat/webapps

# Change the value of the shared.loader= property to the following:
# shared.loader=${catalina.base}/shared/classes
Expand Down Expand Up @@ -97,8 +94,8 @@ RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \

# Docker CMD from parent image starts the server

# Unpack ROOT.war and make alfresco and ROOT read-only.
RUN mkdir /usr/local/tomcat/webapps/ROOT && cd /usr/local/tomcat/webapps/ROOT && jar -xvf /usr/local/tomcat/webapps/ROOT.war && rm -f /usr/local/tomcat/webapps/ROOT.war && chmod -R =r /usr/local/tomcat/webapps && \
# Make webapps folder read-only.
RUN chmod -R =r /usr/local/tomcat/webapps && \
# Add catalina.policy to ROOT.war and alfresco.war
# Grant all security permissions to alfresco webapp because of numerous permissions required in order to work properly.
# Grant only deployXmlPermission to ROOT webapp.
Expand All @@ -114,9 +111,6 @@ RUN yum install -y fontconfig-2.13.0-4.3.el7 \
dejavu-sans-fonts-2.33-6.el7 && \
yum clean all

# Unpack _vti_bin.war
RUN mkdir /usr/local/tomcat/webapps/_vti_bin && cd /usr/local/tomcat/webapps/_vti_bin && jar -xvf /usr/local/tomcat/webapps/_vti_bin.war && rm -f /usr/local/tomcat/webapps/_vti_bin.war

# To remote debug into this image add: EXPOSE 8000
# Changes are also required to the docker-compose/docker-compose.yml file.
# EXPOSE 8000
40 changes: 17 additions & 23 deletions docker-alfresco/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<version>3.0.2</version>
<executions>
<execution>
<id>unpack-resources</id>
<id>unpack-war-files</id>
<phase>process-resources</phase>
<goals>
<goal>unpack</goal>
Expand All @@ -93,21 +93,33 @@
<type>war</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/war/alfresco</outputDirectory>
<destFileName>alfresco.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>api-explorer</artifactId>
<version>${dependency.alfresco-api-explorer.version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/war/api-explorer</outputDirectory>
<destFileName>api-explorer.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-server-root</artifactId>
<version>${dependency.alfresco-server-root.version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/war/ROOT</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.alfresco.aos-module</groupId>
<artifactId>alfresco-vti-bin</artifactId>
<version>${alfresco.aos-module.version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/war/_vti_bin</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-resources-war</id>
<id>copy-jdbc-connectors</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
Expand All @@ -130,30 +142,12 @@
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/alfresco-mmt</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-server-root</artifactId>
<version>${dependency.alfresco-server-root.version}</version>
<type>war</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/server-root</outputDirectory>
<destFileName>ROOT.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.alfresco.aos-module</groupId>
<artifactId>alfresco-vti-bin</artifactId>
<version>${alfresco.aos-module.version}</version>
<type>war</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/vti-bin</outputDirectory>
<destFileName>_vti_bin.war</destFileName>
</artifactItem>
</artifactItems>
</configuration>
</execution>

<execution>
<id>copy-resources-amps</id>
<id>copy-amps</id>
<phase>process-resources</phase>
<goals>
<goal>copy</goal>
Expand Down

0 comments on commit 4fe1d0d

Please sign in to comment.