diff options
fix: move to /w/
| -rw-r--r-- | compose.yml | 2 | ||||
| -rw-r--r-- | mediawiki/Containerfile | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/compose.yml b/compose.yml index 6599c69..38d80a0 100644 --- a/compose.yml +++ b/compose.yml @@ -16,7 +16,7 @@ services: - ./mediawiki/caddy:/etc/caddy:ro - ./mediawiki/php-fpm.d:/etc/php84/php-fpm.d:ro - ./mediawiki/user-uploads:/media/user-uploads:rw # example path for user media, set to whatever is in use during setup - #- ./mediawiki/LocalSettings.php:/var/www/mediawiki/LocalSettings.php:ro # uncomment once setup + #- ./mediawiki/LocalSettings.php:/var/www/mediawiki/w/LocalSettings.php:ro # uncomment once setup ports: - 127.0.0.1:9191:80 # cgroup: host # if you run into issues with openrc not starting correctly diff --git a/mediawiki/Containerfile b/mediawiki/Containerfile index 0691219..01ca95a 100644 --- a/mediawiki/Containerfile +++ b/mediawiki/Containerfile @@ -26,7 +26,7 @@ WORKDIR /root/src/mediawiki RUN tar --strip-components=1 -xzf ../mediawiki.tar.gz RUN rm ../mediawiki.tar.gz FROM openrc AS final -COPY --from=src /root/src/mediawiki /var/www/mediawiki +COPY --from=src /root/src/mediawiki /var/www/mediawiki/w # Dependencies RUN apk add freetype-dev libjpeg-turbo-dev libpng-dev libxml2-dev libzip-dev openssh-client icu-dev imagemagick imagemagick-libs imagemagick-dev git # PHP extensions @@ -34,7 +34,7 @@ RUN apk add php84-json php84-session php84-exif php84-bcmath php84-pdo_mysql php # Caddy RUN apk add caddy caddy-openrc -RUN echo '<?php phpinfo(); ?>' > /var/www/mediawiki/catgirlinfo.php +# RUN echo '<?php phpinfo(); ?>' > /var/www/mediawiki/w/catgirlinfo.php RUN adduser --uid=1001 --system phpfpm RUN rc-update add caddy default RUN rc-update add php-fpm84 default @@ -43,9 +43,9 @@ CMD [ "/sbin/init" ] FROM final AS citizen-builder ARG CITIZEN_BUILD_COMMIT=38bbacd0944d2561a6000263bdef1fd21736d74c -ADD "https://github.com/StarCitizenTools/mediawiki-skins-Citizen/archive/${CITIZEN_BUILD_COMMIT}.zip" /var/www/mediawiki/skins/citizen.zip +ADD "https://github.com/StarCitizenTools/mediawiki-skins-Citizen/archive/${CITIZEN_BUILD_COMMIT}.zip" /var/www/mediawiki/w/skins/citizen.zip RUN apk add unzip -WORKDIR /var/www/mediawiki/skins +WORKDIR /var/www/mediawiki/w/skins RUN unzip citizen.zip && rm citizen.zip && mv mediawiki-skins-Citizen* Citizen FROM final AS final-citizen -COPY --from=citizen-builder /var/www/mediawiki/skins/Citizen /var/www/mediawiki/skins/Citizen
\ No newline at end of file +COPY --from=citizen-builder /var/www/mediawiki/w/skins/Citizen /var/www/mediawiki/w/skins/Citizen |