Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/fix issue 566 #567

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Feature/fix issue 566 #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ade0b3e
All config moved from file alfresco-global.properties into Dockerfile…
douglascrp May 1, 2019
9797075
As the Dockerfile is created when the project is created by using the…
douglascrp May 1, 2019
d42af92
All config moved from file alfresco-global.properties into Dockerfile…
douglascrp May 1, 2019
3ab89ad
As the Dockerfile is created when the project is created by using the…
douglascrp May 1, 2019
7b87aaf
Update Dockerfile
douglascrp May 6, 2019
3f8ee2a
Update Dockerfile
douglascrp May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...ypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
<directory>src/main/docker</directory>
<includes>
<include>license/**</include>
<include>Dockerfile</include>
<include>disable-webscript-caching-context.xml</include>
</includes>
<excludes>
Expand All @@ -135,10 +134,10 @@
<directory>src/main/docker</directory>
<includes>
<include>**/*.properties</include>
<include>Dockerfile</include>
</includes>
<excludes>
<exclude>license/**</exclude>
<exclude>Dockerfile</exclude>
<exclude>disable-webscript-caching-context.xml</exclude>
</excludes>
</fileSet>
Expand Down
61 changes: 60 additions & 1 deletion ...sources/archetype-resources/__rootArtifactId__-platform-docker/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,63 @@ COPY dev-log4j.properties $TOMCAT_DIR/shared/classes/alfresco/extension
COPY disable-webscript-caching-context.xml $TOMCAT_DIR/shared/classes/alfresco/extension

# Copy Dockerfile to avoid an error if no license file exists
COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/
COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/

# Alfresco configuration for running locally with PostgreSQL Database
RUN echo -e '\n\
# Alfresco Repo Webapp (alfresco.war) context, ports etc\n\
alfresco.context=alfresco\n\
alfresco.host=localhost\n\
alfresco.port=8080\n\
alfresco.protocol=http\n\
\n\
# Alfresco Share Webapp (share.war) context, ports etc\n\
share.context=share\n\
share.host=localhost\n\
share.port=8180\n\
share.protocol=http\n\
\n\
# Don''t try and recover any index\n\
index.recovery.mode=NONE\n\
\n\
# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date\n\
# See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597\n\
# If you want to enable them (and so full WQS functionality), please also set index.subsystem.name=lucene\n\
wcmqs.dynamicCollectionProcessor.schedule=0 30 2 * * ? 2060\n\
wcmqs.feedbackProcessor.schedule=0 40 2 * * ? 2060\n\
wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060\n\
\n\
# Fail or not when there are node integrity checker errors\n\
integrity.failOnError=true\n\
\n\
# Alfresco Repository PostgreSQL Database configuration.\n\
db.driver=org.postgresql.Driver\n\
\n\
# This Alfresco Platform Configuration file should be used for custom properties that are introduced by this module.\n\
# Define default values for all properties here.\n\
# System Administrators can override these values in environment specific configurations in\n\
# alfresco/tomcat/shared/classes/alfresco-global.properties.\n\
#\n\
index.subsystem.name=solr6\n\
solr.host=${rootArtifactId}-ass\n\
solr.port=8983\n\
solr.secureComms=none\n\
\n\
db.username=alfresco\n\
db.password=alfresco\n\
db.pool.initial=10\n\
db.pool.max=100\n\
\n\
db.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco\n\
\n\
# File servers related properties\n\
# For local runs we disable CIFS and FTP\n\
cifs.enabled=false\n\
ftp.enabled=false\n\
\n\
csrf.filter.enabled=false\n\
\n\
# Embedded broker without persistence\n\
messaging.broker.url=vm://localhost?broker.persistent=false\n\
\n\
' >> /usr/local/tomcat/shared/classes/alfresco-global.properties
82 changes: 0 additions & 82 deletions ...e-resources/__rootArtifactId__-platform-docker/src/main/docker/alfresco-global.properties
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions .../alfresco-platform-jar-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<directory>src/main/docker</directory>
<includes>
<include>license/**</include>
<include>Dockerfile</include>
<include>disable-webscript-caching-context.xml</include>
</includes>
<excludes>
Expand All @@ -38,10 +37,10 @@
<directory>src/main/docker</directory>
<includes>
<include>**/*.properties</include>
<include>Dockerfile</include>
</includes>
<excludes>
<exclude>license/**</exclude>
<exclude>Dockerfile</exclude>
<exclude>disable-webscript-caching-context.xml</exclude>
</excludes>
</fileSet>
Expand Down
62 changes: 60 additions & 2 deletions ...-platform-jar-archetype/src/main/resources/archetype-resources/src/main/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,67 @@ COPY Dockerfile extensions/*.amp $TOMCAT_DIR/amps/
RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \
$TOMCAT_DIR/amps $TOMCAT_DIR/webapps/alfresco -directory -nobackup -force

COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global.properties
COPY dev-log4j.properties $TOMCAT_DIR/shared/classes/alfresco/extension
COPY disable-webscript-caching-context.xml $TOMCAT_DIR/shared/classes/alfresco/extension

# Copy Dockerfile to avoid an error if no license file exists
COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/
COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/

# Alfresco configuration for running locally with PostgreSQL Database
RUN echo -e '\n\
# Alfresco Repo Webapp (alfresco.war) context, ports etc\n\
alfresco.context=alfresco\n\
alfresco.host=localhost\n\
alfresco.port=8080\n\
alfresco.protocol=http\n\
\n\
# Alfresco Share Webapp (share.war) context, ports etc\n\
share.context=share\n\
share.host=localhost\n\
share.port=8180\n\
share.protocol=http\n\
\n\
# Don''t try and recover any index\n\
index.recovery.mode=NONE\n\
\n\
# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date\n\
# See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597\n\
# If you want to enable them (and so full WQS functionality), please also set index.subsystem.name=lucene\n\
wcmqs.dynamicCollectionProcessor.schedule=0 30 2 * * ? 2060\n\
wcmqs.feedbackProcessor.schedule=0 40 2 * * ? 2060\n\
wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060\n\
\n\
# Fail or not when there are node integrity checker errors\n\
integrity.failOnError=true\n\
\n\
# Alfresco Repository PostgreSQL Database configuration.\n\
db.driver=org.postgresql.Driver\n\
\n\
# This Alfresco Platform Configuration file should be used for custom properties that are introduced by this module.\n\
# Define default values for all properties here.\n\
# System Administrators can override these values in environment specific configurations in\n\
# alfresco/tomcat/shared/classes/alfresco-global.properties.\n\
#\n\
index.subsystem.name=solr6\n\
solr.host=${rootArtifactId}-ass\n\
solr.port=8983\n\
solr.secureComms=none\n\
\n\
db.username=alfresco\n\
db.password=alfresco\n\
db.pool.initial=10\n\
db.pool.max=100\n\
\n\
db.url=jdbc:postgresql://${rootArtifactId}-postgres:5432/alfresco\n\
\n\
# File servers related properties\n\
# For local runs we disable CIFS and FTP\n\
cifs.enabled=false\n\
ftp.enabled=false\n\
\n\
csrf.filter.enabled=false\n\
\n\
# Embedded broker without persistence\n\
messaging.broker.url=vm://localhost?broker.persistent=false\n\
\n\
' >> /usr/local/tomcat/shared/classes/alfresco-global.properties
82 changes: 0 additions & 82 deletions ...chetype/src/main/resources/archetype-resources/src/main/docker/alfresco-global.properties
View file
Open in desktop

This file was deleted.