Merge branch 'sdk-4/acs-61-support' into sdk-4/documentation-update (beae9158) · Commits · Inteligr8 / alfresco-sdk-deletion_scheduled-31

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ services:
		POSTGRES_DB: alfresco
		POSTGRES_USER: alfresco
		POSTGRES_PASSWORD: alfresco
		command: postgres -c max_connections=300 -c log_min_messages=LOG
		ports:
		- "${symbol_dollar}{postgres.port}:5432"
		volumes:

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat

+6 −8

Original line number	Diff line number	Diff line
		@@ -83,23 +83,21 @@ EXIT /B 0
		docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d ${rootArtifactId}-acs
		EXIT /B 0
		:down
		if exist "%COMPOSE_FILE_PATH%" (
		docker-compose -f "%COMPOSE_FILE_PATH%" down
		)
		EXIT /B 0
		:build
		docker rmi alfresco-content-services-${rootArtifactId}:development
		docker rmi alfresco-share-${rootArtifactId}:development
		call %MVN_EXEC% clean install -DskipTests
		EXIT /B 0
		:build_share
		docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-share
		docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-share
		docker rmi alfresco-share-${rootArtifactId}:development
		call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-share-jar
		EXIT /B 0
		:build_acs
		docker-compose -f "%COMPOSE_FILE_PATH%" kill ${rootArtifactId}-acs
		docker-compose -f "%COMPOSE_FILE_PATH%" rm -f ${rootArtifactId}-acs
		docker rmi alfresco-content-services-${rootArtifactId}:development
		call %MVN_EXEC% clean install -DskipTests -pl ${rootArtifactId}-platform-jar
		EXIT /B 0
		:tail
		@@ -112,7 +110,7 @@ EXIT /B 0
		call %MVN_EXEC% verify -pl integration-tests
		EXIT /B 0
		:purge
		docker volume rm ${rootArtifactId}-acs-volume
		docker volume rm ${rootArtifactId}-db-volume
		docker volume rm ${rootArtifactId}-ass-volume
		docker volume rm -f ${rootArtifactId}-acs-volume
		docker volume rm -f ${rootArtifactId}-db-volume
		docker volume rm -f ${rootArtifactId}-ass-volume
		EXIT /B 0
		No newline at end of file

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.sh

+8 −10

Original line number	Diff line number	Diff line
		@@ -25,33 +25,31 @@ start_acs() {
		}

		down() {
		if [ -f ${symbol_dollar}COMPOSE_FILE_PATH ]; then
		docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH down
		fi
		}

		purge() {
		docker volume rm ${rootArtifactId}-acs-volume
		docker volume rm ${rootArtifactId}-db-volume
		docker volume rm ${rootArtifactId}-ass-volume
		docker volume rm -f ${rootArtifactId}-acs-volume
		docker volume rm -f ${rootArtifactId}-db-volume
		docker volume rm -f ${rootArtifactId}-ass-volume
		}

		build() {
		docker rmi alfresco-content-services-${rootArtifactId}:development
		docker rmi alfresco-share-${rootArtifactId}:development
		${symbol_dollar}MVN_EXEC clean install -DskipTests=true
		}

		build_share() {
		docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-share
		yes \| docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-share
		docker rmi alfresco-share-${rootArtifactId}:development
		${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-share-jar
		${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-share-jar,${rootArtifactId}-share-docker
		}

		build_acs() {
		docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH kill ${rootArtifactId}-acs
		yes \| docker-compose -f ${symbol_dollar}COMPOSE_FILE_PATH rm -f ${rootArtifactId}-acs
		docker rmi alfresco-content-services-${rootArtifactId}:development
		${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-platform-jar
		${symbol_dollar}MVN_EXEC clean install -DskipTests=true -pl ${rootArtifactId}-platform-jar,${rootArtifactId}-platform-docker
		}

		tail() {

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ services:
		POSTGRES_DB: alfresco
		POSTGRES_USER: alfresco
		POSTGRES_PASSWORD: alfresco
		command: postgres -c max_connections=300 -c log_min_messages=LOG
		ports:
		- "${symbol_dollar}{postgres.port}:5432"
		volumes:

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/run.bat

+6 −5

Original line number	Diff line number	Diff line
		@@ -65,10 +65,11 @@ EXIT /B %ERRORLEVEL%
		docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d
		EXIT /B 0
		:down
		if exist "%COMPOSE_FILE_PATH%" (
		docker-compose -f "%COMPOSE_FILE_PATH%" down
		)
		EXIT /B 0
		:build
		docker rmi alfresco-content-services-${rootArtifactId}:development
		call %MVN_EXEC% clean install -DskipTests
		EXIT /B 0
		:tail
		@@ -81,7 +82,7 @@ EXIT /B 0
		call %MVN_EXEC% verify
		EXIT /B 0
		:purge
		docker volume rm ${rootArtifactId}-acs-volume
		docker volume rm ${rootArtifactId}-db-volume
		docker volume rm ${rootArtifactId}-ass-volume
		docker volume rm -f ${rootArtifactId}-acs-volume
		docker volume rm -f ${rootArtifactId}-db-volume
		docker volume rm -f ${rootArtifactId}-ass-volume
		EXIT /B 0
		No newline at end of file