docker-compose-build.yml and .gitignore

Author: Jkbr

.gitignore

@@ -1 +1,2 @@
-.idea
+.idea
+.env

docker-compose-build.yml

@@ -20,7 +20,7 @@ services:
     ports:
      - "8181:80"
     volumes:
-      - mediawiki-images-data:/var/www/html/images
+      - /var/www/html/images:/var/www/html/images
     depends_on:
     - mysql
     - elasticsearch
@@ -30,27 +30,35 @@ services:
          - wikibase.svc
     environment:
       - DB_SERVER=mysql.svc:3306
-      - DB_USER=wikiuser
-      - DB_PASS=sqlpass
-      - DB_NAME=my_wiki
-      - MW_ADMIN_NAME=admin
-      - MW_ADMIN_PASS=adminpass
-      - MW_WG_SECRET_KEY=secretkey
+      - DB_USER=${DB_USER}
+      - DB_PASS=${DB_PASS}
+      - DB_NAME=${DB_NAME}
+      - MW_ADMIN_NAME=${MW_ADMIN_NAME}
+      - MW_ADMIN_PASS=${MW_ADMIN_PASS}
+      - MW_WG_SECRET_KEY=${MW_WG_SECRET_KEY}
       - MW_ELASTIC_HOST=elasticsearch.svc
       - MW_ELASTIC_PORT=9200
   mysql:
     image: mariadb:latest
     volumes:
-      - mediawiki-mysql-data:/var/lib/mysql
+      - /var/lib/mysql_wikibase:/var/lib/mysql
     environment:
-      MYSQL_DATABASE: 'my_wiki'
-      MYSQL_USER: 'wikiuser'
-      MYSQL_PASSWORD: 'sqlpass'
-      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
     networks:
       default:
         aliases:
          - mysql.svc
+  elasticsearch:
+    image: elasticsearch@sha256:f1dbf2019dc9a4ca5dd458635bfb31f9a601e4905e1d6ca1d65a3958d428f497
+    networks:
+      default:
+        aliases:
+         - elasticsearch.svc
+    environment:
+      discovery.type: single-node
   wdqs-frontend:
     image: wikibase/wdqs-frontend:latest
     build:
@@ -68,10 +76,10 @@ services:
       - WIKIBASE_HOST=wikibase.svc
       - WDQS_HOST=wdqs-proxy.svc
   wdqs:
-    image: wikibase/wdqs:0.3.0
+    image: wikibase/wdqs:0.3.1
     restart: always
     build:
-      context: ./wdqs/0.3.0
+      context: ./wdqs/0.3.1
       dockerfile: Dockerfile
     volumes:
       - query-service-data:/wdqs/data
@@ -101,31 +109,6 @@ services:
       default:
         aliases:
          - wdqs-proxy.svc
-  wdqs-updater:
-    image: wikibase/wdqs:0.3.0
-    build:
-      context: ./wdqs/0.3.0
-      dockerfile: Dockerfile
-    command: /runUpdate.sh
-    depends_on:
-    - wdqs
-    - wikibase
-    networks:
-      default:
-        aliases:
-         - wdqs-updater.svc
-    environment:
-     - WIKIBASE_HOST=wikibase.svc
-     - WDQS_HOST=wdqs.svc
-     - WDQS_PORT=9999
-  elasticsearch:
-    image: elasticsearch@sha256:f1dbf2019dc9a4ca5dd458635bfb31f9a601e4905e1d6ca1d65a3958d428f497
-    networks:
-      default:
-        aliases:
-         - elasticsearch.svc
-    environment:
-      discovery.type: single-node
   quickstatements:
     image: wikibase/quickstatements:latest
     build:
@@ -140,17 +123,16 @@ services:
         aliases:
          - quickstatements.svc
     environment:
-      - OAUTH_CONSUMER_KEY=559fcf1da153c5ec4b2fbefa7c3c395b
-      - OAUTH_CONSUMER_SECRET=57cad33da0015dce1e94a597908e19848714a6af
-      - QS_PUBLIC_SCHEME_HOST_AND_PORT=http://localhost:9191
-      - WB_PUBLIC_SCHEME_HOST_AND_PORT=http://localhost:8181
-      - WIKIBASE_SCHEME_AND_HOST=http://wikibase.svc
+      - OAUTH_CONSUMER_KEY=${OAUTH_CONSUMER_KEY}
+      - OAUTH_CONSUMER_SECRET=${OAUTH_CONSUMER_SECRET}
+      - QS_PUBLIC_SCHEME_HOST_AND_PORT=https://sciencesource-query.wmflabs.org
+      - WB_PUBLIC_SCHEME_HOST_AND_PORT=https://sciencesource.wmflabs.org
+      - WIKIBASE_SCHEME_AND_HOST=wikibase.svc
       - WB_PROPERTY_NAMESPACE=122
       - "WB_PROPERTY_PREFIX=Property:"
       - WB_ITEM_NAMESPACE=120
       - "WB_ITEM_PREFIX=Item:"
 
 volumes:
-  mediawiki-mysql-data:
-  mediawiki-images-data:
-  query-service-data:
+  query-service-data:
+