15:37:46 brennen@inertia:~/code/wmf/operations/deployment-charts (master m2/u0) ✶ git status On branch master Your branch is up-to-date with 'origin/master'. Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: charts/mediawiki-dev/setup.sh modified: charts/mediawiki-dev/values.yaml no changes added to commit (use "git add" and/or "git commit -a") 15:37:49 brennen@inertia:~/code/wmf/operations/deployment-charts (master m2/u0) ✶ git diff diff --git a/charts/mediawiki-dev/setup.sh b/charts/mediawiki-dev/setup.sh index 945a030..adc365c 100644 --- a/charts/mediawiki-dev/setup.sh +++ b/charts/mediawiki-dev/setup.sh @@ -3,10 +3,10 @@ set -eu # Shamelessly repurposed from Adshore's mediawiki-docker-dev: https://github.com/addshore/mediawiki-docker-dev/ # Hide the current LocalSettings.php if it exists -if [ -f /var/www/html/LocalSettings.php ] -then - mv /var/www/html/LocalSettings.php /var/www/html/LocalSettings.php.docker.tmp -fi +# if [ -f /var/www/html/LocalSettings.php ] +# then +# mv /var/www/html/LocalSettings.php /var/www/html/LocalSettings.php.docker.tmp +# fi # Install the base Mediawiki tables on the db server & remove the generated LocalSettings.php if [ "$DB_SERVER" = "" ] @@ -27,14 +27,13 @@ then exit 1 fi -php /var/www/html/maintenance/install.php --dbuser "root" --dbpass "$DB_PASS" --dbname "$DB_NAME" --dbserver "$DB_SERVER" --lang "en" --pass "$WIKI_ADMIN_PASS" "$WIKI_NAME" "$WIKI_ADMIN"; -rm /var/www/html/LocalSettings.php +php /var/www/html/maintenance/install.php --confpath "/tmp" --dbuser "root" --dbpass "$DB_PASS" --dbname "$DB_NAME" --dbserver "$DB_SERVER" --lang "en" --pass "$WIKI_ADMIN_PASS" "$WIKI_NAM # Move back the old LocalSettings if we had moved one! -if [ -f /var/www/html/LocalSettings.php.docker.tmp ] -then - mv /var/www/html/LocalSettings.php.docker.tmp /var/www/html/LocalSettings.php -fi +# if [ -f /var/www/html/LocalSettings.php.docker.tmp ] +# then +# mv /var/www/html/LocalSettings.php.docker.tmp /var/www/html/LocalSettings.php +# fi # Run update.php too -php /var/www/html/maintenance/update.php --wiki "$DB_NAME" --quick \ No newline at end of file +php /var/www/html/maintenance/update.php --wiki "$DB_NAME" --quick diff --git a/charts/mediawiki-dev/values.yaml b/charts/mediawiki-dev/values.yaml index 6288748..9cde1bf 100644 --- a/charts/mediawiki-dev/values.yaml +++ b/charts/mediawiki-dev/values.yaml @@ -11,9 +11,9 @@ main_app: image: dev/mediawiki version: latest # we use latest everywhere in the defaults. ports: - - 80 + - 8080 command: '["/bin/bash", "-c"]' # use to override the entrypoint command ex: '["node"]' - args: '/var/config/setup.sh && /usr/bin/php -S 0.0.0.0:80 -t /var/www/html' # any args for your command above ex: 'bin/server.js' + args: '/var/config/setup.sh && php-fpm7.2 -D && /usr/sbin/apache2ctl -D FOREGROUND' # any args for your command above ex: 'bin/server.js' requests: # Current image we use is using a single threaded php server, update this when the image changes cpu: 15m memory: 100Mi @@ -22,11 +22,11 @@ main_app: memory: 200Mi liveness_probe: tcpSocket: - port: 80 + port: 8080 readiness_probe: httpGet: path: /wiki/Special:BlankPage - port: 80 + port: 8080 volumes: [] # add here any volumes to mount onto the container volumeMounts: [] # add here any mounted volumes xdebug: @@ -41,7 +41,7 @@ service: ports: - name: http protocol: TCP - targetPort: 80 + targetPort: 8080 port: 80 nodePort: null # you need to define this if "production" is used. In minikube environments let it autoallocate config: