inteligr8/acs-community-packaging
1
0
Fork 0
mirror of https://github.com/Alfresco/acs-community-packaging.git synced 2025-09-10 14:12:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-7470] migrate to docker compose v2

Browse Source
This commit is contained in:
kcichonczyk
2024-04-04 11:20:59 +02:00
committed by GitHub
parent c7794747ee
commit 718f352838
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dev/README.md
View File

@@ -66,9 +66,9 @@ The repository code will need to talk to other ACS components, such as a databas
The simplest way to create these, is to use the `docker-compose.yml` file in the `dev` directory. The simplest way to create these, is to use the `docker-compose.yml` file in the `dev` directory.
~~~ ~~~
# The `envUp` alias is the same as the following commands. Run these in a new terminal session, or add a `-d` flag to # The `envUp` alias is the same as the following commands. Run these in a new terminal session, or add a `-d` flag to
the `docker-compose` command. the `docker compose` command.
cd acs-community-packaging cd acs-community-packaging
docker-compose -f dev/docker-compose.yml up docker compose -f dev/docker-compose.yml up
Creating dev_activemq_1 ... done Creating dev_activemq_1 ... done
Creating dev_solr6_1 ... done Creating dev_solr6_1 ... done
Creating dev_postgres_1 ... done Creating dev_postgres_1 ... done
@@ -120,13 +120,13 @@ mvn install -Prun,withShare -rf dev-acs-amps-overlay
## Clean up ## Clean up
When finished, kill the tomcat instance and stop the Docker instances. You will normally also When finished, kill the tomcat instance and stop the Docker instances. You will normally also
remove the Docker containers, as you will need a clean database if you are going to issue remove the Docker containers, as you will need a clean database if you are going to issue
another `mvn clean install` command. If you started `docker-compose` in a separate terminal session, another `mvn clean install` command. If you started `docker compose` in a separate terminal session,
simply use `^C` or if you used a `-d` flag, use `docker-compose -f dev/docker-compose.yml stop`. simply use `^C` or if you used a `-d` flag, use `docker compose -f dev/docker-compose.yml stop`.
~~~ ~~~
^C ^C
... Stopped 'sysAdmin' subsystem, ID: [sysAdmin, default] ... Stopped 'sysAdmin' subsystem, ID: [sysAdmin, default]
docker-compose -f dev/docker-compose.yml rm docker compose -f dev/docker-compose.yml rm
Going to remove dev_transform-core-aio_1, dev_transform-router_1, dev_solr6_1, dev_postgres_1, dev_activemq_1, dev_shared-file-store_1 Going to remove dev_transform-core-aio_1, dev_transform-router_1, dev_solr6_1, dev_postgres_1, dev_activemq_1, dev_shared-file-store_1
Are you sure? [yN] y Are you sure? [yN] y
Removing dev_transform-core-aio_1 ... done Removing dev_transform-core-aio_1 ... done

6
dev/aliases
View File

@@ -65,6 +65,6 @@ alias comXS='comS && comP'
alias drm='docker rm -f $(docker ps -q)' alias drm='docker rm -f $(docker ps -q)'
alias arm='rm -rf `find . -name alf_data`' alias arm='rm -rf `find . -name alf_data`'
alias envUp='./acs-community-packaging/scripts/dev/start-compose.sh' alias envUp='./acs-community-packaging/scripts/dev/start-compose.sh'
alias envStop='docker-compose -f acs-community-packaging/dev/docker-compose.yml stop' alias envStop='docker compose -f acs-community-packaging/dev/docker-compose.yml stop'
alias envKill='docker-compose -f acs-community-packaging/dev/docker-compose.yml kill' alias envKill='docker compose -f acs-community-packaging/dev/docker-compose.yml kill'
alias envRm='docker-compose -f acs-community-packaging/dev/docker-compose.yml rm' alias envRm='docker compose -f acs-community-packaging/dev/docker-compose.yml rm'

2
scripts/dev/start-compose.sh
View File

@@ -2,4 +2,4 @@ set -x
export TRANSFORMERS_TAG=$(mvn -f acs-community-packaging/pom.xml help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout) export TRANSFORMERS_TAG=$(mvn -f acs-community-packaging/pom.xml help:evaluate -Dexpression=dependency.alfresco-transform-core.version -q -DforceStdout)
# .env files are picked up from project directory correctly on docker-compose 1.23.0+ # .env files are picked up from project directory correctly on docker-compose 1.23.0+
docker-compose -f acs-community-packaging/dev/docker-compose.yml up docker compose -f acs-community-packaging/dev/docker-compose.yml up