Skip to content

Commit

Permalink
2025 Jan: update magnustools (#135)
Browse files Browse the repository at this point in the history
* fix Dockerfile

* DEBUG update composer

* Update magnustools version

---------

Co-authored-by: Andrew Kostka <andrew.kostka@wikimedia.de>
  • Loading branch information
deer-wmde and AndrewKostka authored Feb 3, 2025
1 parent c5890d8 commit 067456b
Show file tree
Hide file tree
Showing 3 changed files with 1,020 additions and 14 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
FROM composer@sha256:d374b2e1f715621e9d9929575d6b35b11cf4a6dc237d4a08f2e6d1611f534675 as composer
# composer is pinned at a PHP 7 version
FROM composer:2.8 as composer

WORKDIR /installing
COPY ./ /installing
RUN composer install --no-dev --no-progress --no-autoloader && rm -rf vendor


FROM php:7.2-apache
FROM php:8.1-apache

LABEL org.opencontainers.image.source="https://github.com/wbstack/widar"

# For session storage
RUN pecl install redis-4.0.1 && docker-php-ext-enable redis
RUN pecl install redis && docker-php-ext-enable redis

COPY docker/entrypoint.sh /entrypoint.sh
COPY docker/php.ini /usr/local/etc/php/conf.d/php.ini
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
],
"require": {
"wbstack/magnustools": "dev-main"
"wbstack/magnustools": "dev-main#68dfeb87266a66d751fbf28937ffc03a779a8450"
},
"scripts": {
"post-install-cmd": [
Expand Down
Loading

0 comments on commit 067456b

Please sign in to comment.