This repository has been archived by the owner on Oct 7, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 218
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #79 from walkerlee/2.0
Upgrade to docker-compose version 3
- Loading branch information
Showing
10 changed files
with
290 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,56 @@ | ||
| postgresql: | ||
| restart: always | ||
| image: sameersbn/postgresql:9.6-2 | ||
| environment: | ||
| - DB_USER=gitlab | ||
| - DB_PASS=password | ||
| - DB_NAME=gitlabhq_production | ||
| - DB_EXTENSION=pg_trgm | ||
| gitlab: | ||
| restart: always | ||
| image: sameersbn/gitlab:11.4.0 | ||
| links: | ||
| - redis:redisio | ||
| - postgresql:postgresql | ||
| ports: | ||
| - "10080:80" | ||
| - "10022:22" | ||
| environment: | ||
| - DEBUG=false | ||
| - GITLAB_PORT=10080 | ||
| - GITLAB_SSH_PORT=10022 | ||
| - GITLAB_SECRETS_DB_KEY_BASE=qcs-gitlab-app | ||
| - GITLAB_SECRETS_OTP_KEY_BASE=qcs-gitlab-app | ||
| - GITLAB_SECRETS_SECRET_KEY_BASE=qcs-gitlab-app | ||
| redis: | ||
| restart: always | ||
| image: sameersbn/redis:latest | ||
| command: | ||
| - --loglevel warning | ||
| version: '3' | ||
|
|
||
| services: | ||
| redis: | ||
| image: sameersbn/redis:4.0.9-1 | ||
| restart: always | ||
| command: | ||
| - --loglevel warning | ||
| # volumes: | ||
| # - redis_data:/var/lib/redis | ||
|
|
||
| postgresql: | ||
| image: sameersbn/postgresql:10 | ||
| restart: always | ||
| # volumes: | ||
| # - postgresql_data:/var/lib/postgresql | ||
| environment: | ||
| DB_USER: gitlab | ||
| DB_PASS: password | ||
| DB_NAME: gitlabhq_production | ||
| DB_EXTENSION: pg_trgm | ||
|
|
||
| gitlab: | ||
| depends_on: | ||
| - redis | ||
| - postgresql | ||
| image: sameersbn/gitlab:11.10.4 | ||
| restart: always | ||
| # volumes: | ||
| # - gitlab_data:/home/git/data | ||
| ports: | ||
| - "10080:80" | ||
| - "10022:22" | ||
| environment: | ||
| # DEBUG: false | ||
|
|
||
| DB_ADAPTER: postgresql | ||
| DB_HOST: postgresql | ||
| DB_PORT: 5432 | ||
| DB_USER: gitlab | ||
| DB_PASS: password | ||
| DB_NAME: gitlabhq_production | ||
|
|
||
| REDIS_HOST: redis | ||
| REDIS_PORT: 6379 | ||
|
|
||
| GITLAB_PORT: 10080 | ||
| GITLAB_SSH_PORT: 10022 | ||
| GITLAB_SECRETS_DB_KEY_BASE: qcs-gitlab-app | ||
| GITLAB_SECRETS_OTP_KEY_BASE: qcs-gitlab-app | ||
| GITLAB_SECRETS_SECRET_KEY_BASE: qcs-gitlab-app | ||
|
|
||
| #volumes: | ||
| # redis_data: | ||
| # postgresql_data: | ||
| # gitlab_data: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <form> | ||
| <fieldset> | ||
| <fieldset name="basic"> | ||
| <field | ||
| name="db_type" | ||
| type="databaseconnection" | ||
| label="INSTL_DATABASE_TYPE_LABEL" | ||
| id="db_type" | ||
| class="inputbox" | ||
| supported="mysql,mysqli,pgsql,pdomysql,postgresql,sqlsrv,sqlazure" | ||
| required="true" | ||
| default="mysqli" | ||
| filter="string" | ||
| /> | ||
|
|
||
| <field | ||
| name="db_host" | ||
| type="text" | ||
| label="INSTL_DATABASE_HOST_LABEL" | ||
| id="db_host" | ||
| class="inputbox" | ||
| default="db:3306" | ||
| required="true" | ||
| /> | ||
|
|
||
| <field | ||
| name="db_user" | ||
| type="text" | ||
| label="INSTL_DATABASE_USER_LABEL" | ||
| id="db_user" | ||
| class="inputbox" | ||
| default="joomla" | ||
| required="true" | ||
| /> | ||
|
|
||
| <field | ||
| name="db_pass" | ||
| type="password" | ||
| label="INSTL_DATABASE_PASSWORD_LABEL" | ||
| id="db_pass" | ||
| class="inputbox" | ||
| autocomplete="off" | ||
| default="joomla" | ||
| filter="raw" | ||
| /> | ||
|
|
||
| <field | ||
| name="db_name" | ||
| type="text" | ||
| label="INSTL_DATABASE_NAME_LABEL" | ||
| id="db_name" | ||
| class="inputbox" | ||
| default="joomla" | ||
| required="true" | ||
| /> | ||
| </fieldset> | ||
|
|
||
| <!-- Advanced Settings --> | ||
| <fieldset name="advanced"> | ||
| <field | ||
| name="db_old" | ||
| type="radio" | ||
| label="INSTL_DATABASE_OLD_PROCESS_LABEL" | ||
| id="db_old" | ||
| class="btn-group" | ||
| default="backup" | ||
| required="true" | ||
| > | ||
| <option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option> | ||
| <option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option> | ||
| </field> | ||
|
|
||
| <field | ||
| name="db_prefix" | ||
| type="installation.prefix" | ||
| label="INSTL_DATABASE_PREFIX_LABEL" | ||
| id="db_prefix" | ||
| class="inputbox" | ||
| required="true" | ||
| validate="installation.prefix" | ||
| message="INSTL_DATABASE_PREFIX_MSG" | ||
| autocomplete="off" | ||
| /> | ||
| </fieldset> | ||
| </fieldset> | ||
| </form> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,29 @@ | ||
| db: | ||
| image: mariadb:10.2 | ||
| environment: | ||
| - MYSQL_ROOT_PASSWORD=admin | ||
| - MYSQL_USER=joomla | ||
| - MYSQL_PASSWORD=joomla | ||
| - MYSQL_DATABASE=joomla | ||
| web: | ||
| image: edhongcy/joomla-without-database:3.8.13 | ||
| links: | ||
| - db:db | ||
| ports: | ||
| - "10082:80" | ||
| environment: | ||
| - DB_HOST=db | ||
| - DB_USER=joomla | ||
| - DB_PASSWORD=joomla | ||
| - DB_NAME=joomla | ||
| version: '3' | ||
|
|
||
| services: | ||
| db: | ||
| image: mysql:5.7 | ||
| restart: always | ||
| # volumes: | ||
| # - db_data:/var/lib/mysql | ||
| environment: | ||
| MYSQL_ROOT_PASSWORD: example | ||
| MYSQL_DATABASE: joomla | ||
| MYSQL_USER: joomla | ||
| MYSQL_PASSWORD: joomla | ||
|
|
||
| joomla: | ||
| depends_on: | ||
| - db | ||
| image: joomla:3.9.5 | ||
| restart: always | ||
| ports: | ||
| - "10082:80" | ||
| volumes: | ||
| - ./database.xml:/var/www/html/installation/model/forms/database.xml | ||
| environment: | ||
| JOOMLA_DB_HOST: db:3306 | ||
| JOOMLA_DB_PASSWORD: example | ||
|
|
||
| #volumes: | ||
| # db_data: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,21 @@ | ||
| db: | ||
| image: postgres:10.0 | ||
| environment: | ||
| - POSTGRES_USER=odoo | ||
| - POSTGRES_PASSWORD=odoo | ||
| version: '3' | ||
|
|
||
| web: | ||
| image: odoo:12 | ||
| links: | ||
| - db:db | ||
| ports: | ||
| - "18069:8069" | ||
| services: | ||
| db: | ||
| image: postgres:10 | ||
| # volumes: | ||
| # - db_data:/var/lib/postgresql | ||
| environment: | ||
| - POSTGRES_DB=postgres | ||
| - POSTGRES_USER=odoo | ||
| - POSTGRES_PASSWORD=odoo | ||
|
|
||
| web: | ||
| depends_on: | ||
| - db | ||
| image: odoo:12.0 | ||
| ports: | ||
| - "18069:8069" | ||
|
|
||
| #volumes: | ||
| # db_data: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,23 @@ | ||
| db: | ||
| image: e1ee1e11/postgresql_armhf:9.4.8-1 | ||
| environment: | ||
| - POSTGRES_USER=openerp_8 | ||
| - POSTGRES_PASSWORD=qwerty | ||
| volumes: | ||
| - ${PWD}/flash/postgres_folder:/media/postgres_folder | ||
| version: '3' | ||
|
|
||
| web: | ||
| image: e1ee1e11/arm-odoo:8.0 | ||
| user: openerp_user | ||
| links: | ||
| - db:db | ||
| volumes: | ||
| - ${PWD}/odoo_addons:/opt/openerp_8/my_addons | ||
| ports: | ||
| - "18069:8069" | ||
| services: | ||
| db: | ||
| image: e1ee1e11/postgresql_armhf:9.4.8-1 | ||
| volumes: | ||
| - ${PWD}/flash/postgres_folder:/media/postgres_folder | ||
| environment: | ||
| - POSTGRES_USER=openerp_8 | ||
| - POSTGRES_PASSWORD=qwerty | ||
|
|
||
| web: | ||
| depends_on: | ||
| - db | ||
| image: e1ee1e11/arm-odoo:8.0 | ||
| user: openerp_user | ||
| volumes: | ||
| - ${PWD}/odoo_addons:/opt/openerp_8/my_addons | ||
| ports: | ||
| - "18069:8069" | ||
| environment: | ||
| - POSTGRES_USER=openerp_8 | ||
| - POSTGRES_PASSWORD=qwerty |
Oops, something went wrong.