Skip to content

Commit 85b8c40

Browse files
author
Jkbr
committed
docker-compose-build.yml and .gitignore
1 parent d0cbb01 commit 85b8c40

File tree

2 files changed

+31
-48
lines changed

2 files changed

+31
-48
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
.idea
1+
.idea
2+
.env

docker-compose-build.yml

+29-47
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
ports:
2121
- "8181:80"
2222
volumes:
23-
- mediawiki-images-data:/var/www/html/images
23+
- /var/www/html/images:/var/www/html/images
2424
depends_on:
2525
- mysql
2626
- elasticsearch
@@ -30,27 +30,35 @@ services:
3030
- wikibase.svc
3131
environment:
3232
- DB_SERVER=mysql.svc:3306
33-
- DB_USER=wikiuser
34-
- DB_PASS=sqlpass
35-
- DB_NAME=my_wiki
36-
- MW_ADMIN_NAME=admin
37-
- MW_ADMIN_PASS=adminpass
38-
- MW_WG_SECRET_KEY=secretkey
33+
- DB_USER=${DB_USER}
34+
- DB_PASS=${DB_PASS}
35+
- DB_NAME=${DB_NAME}
36+
- MW_ADMIN_NAME=${MW_ADMIN_NAME}
37+
- MW_ADMIN_PASS=${MW_ADMIN_PASS}
38+
- MW_WG_SECRET_KEY=${MW_WG_SECRET_KEY}
3939
- MW_ELASTIC_HOST=elasticsearch.svc
4040
- MW_ELASTIC_PORT=9200
4141
mysql:
4242
image: mariadb:latest
4343
volumes:
44-
- mediawiki-mysql-data:/var/lib/mysql
44+
- /var/lib/mysql_wikibase:/var/lib/mysql
4545
environment:
46-
MYSQL_DATABASE: 'my_wiki'
47-
MYSQL_USER: 'wikiuser'
48-
MYSQL_PASSWORD: 'sqlpass'
49-
MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
46+
MYSQL_DATABASE: ${MYSQL_DATABASE}
47+
MYSQL_USER: ${MYSQL_USER}
48+
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
49+
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
5050
networks:
5151
default:
5252
aliases:
5353
- mysql.svc
54+
elasticsearch:
55+
image: elasticsearch@sha256:f1dbf2019dc9a4ca5dd458635bfb31f9a601e4905e1d6ca1d65a3958d428f497
56+
networks:
57+
default:
58+
aliases:
59+
- elasticsearch.svc
60+
environment:
61+
discovery.type: single-node
5462
wdqs-frontend:
5563
image: wikibase/wdqs-frontend:latest
5664
build:
@@ -68,10 +76,10 @@ services:
6876
- WIKIBASE_HOST=wikibase.svc
6977
- WDQS_HOST=wdqs-proxy.svc
7078
wdqs:
71-
image: wikibase/wdqs:0.3.0
79+
image: wikibase/wdqs:0.3.1
7280
restart: always
7381
build:
74-
context: ./wdqs/0.3.0
82+
context: ./wdqs/0.3.1
7583
dockerfile: Dockerfile
7684
volumes:
7785
- query-service-data:/wdqs/data
@@ -101,31 +109,6 @@ services:
101109
default:
102110
aliases:
103111
- wdqs-proxy.svc
104-
wdqs-updater:
105-
image: wikibase/wdqs:0.3.0
106-
build:
107-
context: ./wdqs/0.3.0
108-
dockerfile: Dockerfile
109-
command: /runUpdate.sh
110-
depends_on:
111-
- wdqs
112-
- wikibase
113-
networks:
114-
default:
115-
aliases:
116-
- wdqs-updater.svc
117-
environment:
118-
- WIKIBASE_HOST=wikibase.svc
119-
- WDQS_HOST=wdqs.svc
120-
- WDQS_PORT=9999
121-
elasticsearch:
122-
image: elasticsearch@sha256:f1dbf2019dc9a4ca5dd458635bfb31f9a601e4905e1d6ca1d65a3958d428f497
123-
networks:
124-
default:
125-
aliases:
126-
- elasticsearch.svc
127-
environment:
128-
discovery.type: single-node
129112
quickstatements:
130113
image: wikibase/quickstatements:latest
131114
build:
@@ -140,17 +123,16 @@ services:
140123
aliases:
141124
- quickstatements.svc
142125
environment:
143-
- OAUTH_CONSUMER_KEY=559fcf1da153c5ec4b2fbefa7c3c395b
144-
- OAUTH_CONSUMER_SECRET=57cad33da0015dce1e94a597908e19848714a6af
145-
- QS_PUBLIC_SCHEME_HOST_AND_PORT=http://localhost:9191
146-
- WB_PUBLIC_SCHEME_HOST_AND_PORT=http://localhost:8181
147-
- WIKIBASE_SCHEME_AND_HOST=http://wikibase.svc
126+
- OAUTH_CONSUMER_KEY=${OAUTH_CONSUMER_KEY}
127+
- OAUTH_CONSUMER_SECRET=${OAUTH_CONSUMER_SECRET}
128+
- QS_PUBLIC_SCHEME_HOST_AND_PORT=https://sciencesource-query.wmflabs.org
129+
- WB_PUBLIC_SCHEME_HOST_AND_PORT=https://sciencesource.wmflabs.org
130+
- WIKIBASE_SCHEME_AND_HOST=wikibase.svc
148131
- WB_PROPERTY_NAMESPACE=122
149132
- "WB_PROPERTY_PREFIX=Property:"
150133
- WB_ITEM_NAMESPACE=120
151134
- "WB_ITEM_PREFIX=Item:"
152135

153136
volumes:
154-
mediawiki-mysql-data:
155-
mediawiki-images-data:
156-
query-service-data:
137+
query-service-data:
138+

0 commit comments

Comments
 (0)