Skip to content
This repository was archived by the owner on Oct 7, 2024. It is now read-only.

Commit ee68478

Browse files
walkerleewalkerlee
committed
chore: upgrade to docker-compose version 3
1 parent bafc8ac commit ee68478

File tree

10 files changed

+290
-112
lines changed

10 files changed

+290
-112
lines changed

‎list.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"icon": "https://raw.githubusercontent.com/qnap-dev/container-apps/1.10/images/app_gitlab.png",
77
"displayName": "GitLab",
88
"name": "gitlab",
9-
"version": "11.4.0",
9+
"version": "11.10.4",
1010
"location": "https://hub.docker.com/r/sameersbn/gitlab",
1111
"type": "app"
1212
},
@@ -17,7 +17,7 @@
1717
"icon": "https://raw.githubusercontent.com/qnap-dev/container-apps/1.10/images/app_redmine.png",
1818
"displayName": "Redmine",
1919
"name": "redmine",
20-
"version": "3.4.6",
20+
"version": "4.0.3-1",
2121
"location": "https://hub.docker.com/r/sameersbn/redmine",
2222
"type": "app"
2323
},
@@ -28,7 +28,7 @@
2828
"icon": "https://raw.githubusercontent.com/qnap-dev/container-apps/1.10/images/app_registry.png",
2929
"displayName": "Registry",
3030
"name": "registry",
31-
"version": "2.6.2",
31+
"version": "2.7.1",
3232
"location": "https://hub.docker.com/_/registry",
3333
"type": "app"
3434
},
@@ -39,8 +39,8 @@
3939
"icon": "https://raw.githubusercontent.com/qnap-dev/container-apps/1.10/images/app_joomla.png",
4040
"displayName": "Joomla!",
4141
"name": "joomla",
42-
"version": "3.8.13",
43-
"location": "https://hub.docker.com/r/seterrychen/joomla-without-database",
42+
"version": "3.9.5",
43+
"location": "https://hub.docker.com/_/joomla",
4444
"type": "app"
4545
},
4646
{
@@ -50,7 +50,7 @@
5050
"icon": "https://raw.githubusercontent.com/qnap-dev/container-apps/1.10/images/app_odoo.png",
5151
"displayName": "Odoo",
5252
"name": "odoo",
53-
"version": "12",
53+
"version": "12.0",
5454
"location": "https://hub.docker.com/_/odoo",
5555
"type": "app"
5656
},
@@ -61,7 +61,7 @@
6161
"icon": "https://raw.githubusercontent.com/qnap-dev/container-apps/1.10/images/app_wordpress.png",
6262
"displayName": "WordPress",
6363
"name": "wordpress",
64-
"version": "4.9.8",
64+
"version": "5.1.1",
6565
"location": "https://hub.docker.com/_/wordpress",
6666
"type": "app"
6767
},

‎template/gitlab/docker-compose.yml‎

Lines changed: 56 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,56 @@
1-
postgresql:
2-
restart: always
3-
image: sameersbn/postgresql:9.6-2
4-
environment:
5-
- DB_USER=gitlab
6-
- DB_PASS=password
7-
- DB_NAME=gitlabhq_production
8-
- DB_EXTENSION=pg_trgm
9-
gitlab:
10-
restart: always
11-
image: sameersbn/gitlab:11.4.0
12-
links:
13-
- redis:redisio
14-
- postgresql:postgresql
15-
ports:
16-
- "10080:80"
17-
- "10022:22"
18-
environment:
19-
- DEBUG=false
20-
- GITLAB_PORT=10080
21-
- GITLAB_SSH_PORT=10022
22-
- GITLAB_SECRETS_DB_KEY_BASE=qcs-gitlab-app
23-
- GITLAB_SECRETS_OTP_KEY_BASE=qcs-gitlab-app
24-
- GITLAB_SECRETS_SECRET_KEY_BASE=qcs-gitlab-app
25-
redis:
26-
restart: always
27-
image: sameersbn/redis:latest
28-
command:
29-
- --loglevel warning
1+
version: '3'
2+
3+
services:
4+
redis:
5+
image: sameersbn/redis:4.0.9-1
6+
restart: always
7+
command:
8+
- --loglevel warning
9+
# volumes:
10+
# - redis_data:/var/lib/redis
11+
12+
postgresql:
13+
image: sameersbn/postgresql:10
14+
restart: always
15+
# volumes:
16+
# - postgresql_data:/var/lib/postgresql
17+
environment:
18+
DB_USER: gitlab
19+
DB_PASS: password
20+
DB_NAME: gitlabhq_production
21+
DB_EXTENSION: pg_trgm
22+
23+
gitlab:
24+
depends_on:
25+
- redis
26+
- postgresql
27+
image: sameersbn/gitlab:11.10.4
28+
restart: always
29+
# volumes:
30+
# - gitlab_data:/home/git/data
31+
ports:
32+
- "10080:80"
33+
- "10022:22"
34+
environment:
35+
# DEBUG: false
36+
37+
DB_ADAPTER: postgresql
38+
DB_HOST: postgresql
39+
DB_PORT: 5432
40+
DB_USER: gitlab
41+
DB_PASS: password
42+
DB_NAME: gitlabhq_production
43+
44+
REDIS_HOST: redis
45+
REDIS_PORT: 6379
46+
47+
GITLAB_PORT: 10080
48+
GITLAB_SSH_PORT: 10022
49+
GITLAB_SECRETS_DB_KEY_BASE: qcs-gitlab-app
50+
GITLAB_SECRETS_OTP_KEY_BASE: qcs-gitlab-app
51+
GITLAB_SECRETS_SECRET_KEY_BASE: qcs-gitlab-app
52+
53+
#volumes:
54+
# redis_data:
55+
# postgresql_data:
56+
# gitlab_data:

‎template/gitlab/wizard/stage/install.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
"file": "docker-compose.yml",
3131
"data": {
3232
"http_port": [
33-
"gitlab.ports[0]",
34-
"gitlab.environment.GITLAB_PORT"
33+
"services.gitlab.ports[0]",
34+
"services.gitlab.environment.GITLAB_PORT"
3535
],
3636
"ssh_port": [
37-
"gitlab.environment.GITLAB_SSH_PORT",
38-
"gitlab.ports[1]"
37+
"services.gitlab.environment.GITLAB_SSH_PORT",
38+
"services.gitlab.ports[1]"
3939
]
4040
}
4141
}

‎template/joomla/database.xml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<form>
3+
<fieldset>
4+
<fieldset name="basic">
5+
<field
6+
name="db_type"
7+
type="databaseconnection"
8+
label="INSTL_DATABASE_TYPE_LABEL"
9+
id="db_type"
10+
class="inputbox"
11+
supported="mysql,mysqli,pgsql,pdomysql,postgresql,sqlsrv,sqlazure"
12+
required="true"
13+
default="mysqli"
14+
filter="string"
15+
/>
16+
17+
<field
18+
name="db_host"
19+
type="text"
20+
label="INSTL_DATABASE_HOST_LABEL"
21+
id="db_host"
22+
class="inputbox"
23+
default="db:3306"
24+
required="true"
25+
/>
26+
27+
<field
28+
name="db_user"
29+
type="text"
30+
label="INSTL_DATABASE_USER_LABEL"
31+
id="db_user"
32+
class="inputbox"
33+
default="joomla"
34+
required="true"
35+
/>
36+
37+
<field
38+
name="db_pass"
39+
type="password"
40+
label="INSTL_DATABASE_PASSWORD_LABEL"
41+
id="db_pass"
42+
class="inputbox"
43+
autocomplete="off"
44+
default="joomla"
45+
filter="raw"
46+
/>
47+
48+
<field
49+
name="db_name"
50+
type="text"
51+
label="INSTL_DATABASE_NAME_LABEL"
52+
id="db_name"
53+
class="inputbox"
54+
default="joomla"
55+
required="true"
56+
/>
57+
</fieldset>
58+
59+
<!-- Advanced Settings -->
60+
<fieldset name="advanced">
61+
<field
62+
name="db_old"
63+
type="radio"
64+
label="INSTL_DATABASE_OLD_PROCESS_LABEL"
65+
id="db_old"
66+
class="btn-group"
67+
default="backup"
68+
required="true"
69+
>
70+
<option value="backup">INSTL_DATABASE_FIELD_VALUE_BACKUP</option>
71+
<option value="remove">INSTL_DATABASE_FIELD_VALUE_REMOVE</option>
72+
</field>
73+
74+
<field
75+
name="db_prefix"
76+
type="installation.prefix"
77+
label="INSTL_DATABASE_PREFIX_LABEL"
78+
id="db_prefix"
79+
class="inputbox"
80+
required="true"
81+
validate="installation.prefix"
82+
message="INSTL_DATABASE_PREFIX_MSG"
83+
autocomplete="off"
84+
/>
85+
</fieldset>
86+
</fieldset>
87+
</form>

‎template/joomla/docker-compose.yml‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
1-
db:
2-
image: mariadb:10.2
3-
environment:
4-
- MYSQL_ROOT_PASSWORD=admin
5-
- MYSQL_USER=joomla
6-
- MYSQL_PASSWORD=joomla
7-
- MYSQL_DATABASE=joomla
8-
web:
9-
image: edhongcy/joomla-without-database:3.8.13
10-
links:
11-
- db:db
12-
ports:
13-
- "10082:80"
14-
environment:
15-
- DB_HOST=db
16-
- DB_USER=joomla
17-
- DB_PASSWORD=joomla
18-
- DB_NAME=joomla
1+
version: '3'
2+
3+
services:
4+
db:
5+
image: mysql:5.7
6+
restart: always
7+
# volumes:
8+
# - db_data:/var/lib/mysql
9+
environment:
10+
MYSQL_ROOT_PASSWORD: example
11+
MYSQL_DATABASE: joomla
12+
MYSQL_USER: joomla
13+
MYSQL_PASSWORD: joomla
14+
15+
joomla:
16+
depends_on:
17+
- db
18+
image: joomla:3.9.5
19+
restart: always
20+
ports:
21+
- "10082:80"
22+
volumes:
23+
- ./database.xml:/var/www/html/installation/model/forms/database.xml
24+
environment:
25+
JOOMLA_DB_HOST: db:3306
26+
JOOMLA_DB_PASSWORD: example
27+
28+
#volumes:
29+
# db_data:

‎template/odoo/docker-compose.yml‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
db:
2-
image: postgres:10.0
3-
environment:
4-
- POSTGRES_USER=odoo
5-
- POSTGRES_PASSWORD=odoo
1+
version: '3'
62

7-
web:
8-
image: odoo:12
9-
links:
10-
- db:db
11-
ports:
12-
- "18069:8069"
3+
services:
4+
db:
5+
image: postgres:10
6+
# volumes:
7+
# - db_data:/var/lib/postgresql
8+
environment:
9+
- POSTGRES_DB=postgres
10+
- POSTGRES_USER=odoo
11+
- POSTGRES_PASSWORD=odoo
12+
13+
web:
14+
depends_on:
15+
- db
16+
image: odoo:12.0
17+
ports:
18+
- "18069:8069"
19+
20+
#volumes:
21+
# db_data:

‎template/odooarm/docker-compose.yml‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
1-
db:
2-
image: e1ee1e11/postgresql_armhf:9.4.8-1
3-
environment:
4-
- POSTGRES_USER=openerp_8
5-
- POSTGRES_PASSWORD=qwerty
6-
volumes:
7-
- ${PWD}/flash/postgres_folder:/media/postgres_folder
1+
version: '3'
82

9-
web:
10-
image: e1ee1e11/arm-odoo:8.0
11-
user: openerp_user
12-
links:
13-
- db:db
14-
volumes:
15-
- ${PWD}/odoo_addons:/opt/openerp_8/my_addons
16-
ports:
17-
- "18069:8069"
3+
services:
4+
db:
5+
image: e1ee1e11/postgresql_armhf:9.4.8-1
6+
volumes:
7+
- ${PWD}/flash/postgres_folder:/media/postgres_folder
8+
environment:
9+
- POSTGRES_USER=openerp_8
10+
- POSTGRES_PASSWORD=qwerty
11+
12+
web:
13+
depends_on:
14+
- db
15+
image: e1ee1e11/arm-odoo:8.0
16+
user: openerp_user
17+
volumes:
18+
- ${PWD}/odoo_addons:/opt/openerp_8/my_addons
19+
ports:
20+
- "18069:8069"
21+
environment:
22+
- POSTGRES_USER=openerp_8
23+
- POSTGRES_PASSWORD=qwerty

0 commit comments

Comments
 (0)