From f8bfa23dc18985084c2a2e94781e0a7ae14e2752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20=C5=BB=C3=B3=C5=82tak?= Date: Tue, 3 Dec 2024 17:13:06 +0100 Subject: [PATCH] composer.json: remove unneeded dependency (it's in arche-lib-ingest now) docker/Dockerfile: include php xdebug and vim configuration --- composer.json | 3 +-- docker/Dockerfile | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 650cfbe..1d98e46 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,7 @@ ], "require": { "acdh-oeaw/arche-lib-ingest": "^4", - "zozlak/argparse": "^1", - "kbsali/redmine-api": "^2.2" + "zozlak/argparse": "^1" }, "require-dev": { "phpstan/phpstan": "*" diff --git a/docker/Dockerfile b/docker/Dockerfile index f334edb..f2b5f09 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -6,10 +6,12 @@ RUN curl -L https://github.com/mlocati/docker-php-extension-installer/releases/l apt update &&\ apt install -y clamav clamdscan clamav-daemon gdal-bin screen default-jre-headless git vim exiftool &&\ sed -i -e 's/^User .*/User root/g' /etc/clamav/clamd.conf &&\ - install-php-extensions @composer ctype dom exif fileinfo gd iconv intl libxml mbstring simplexml xml xmlwriter zip zlib bz2 phar yaml &&\ + install-php-extensions @composer ctype dom exif fileinfo gd iconv intl libxml mbstring simplexml xml xmlwriter zip zlib bz2 phar yaml xdebug &&\ ln -s /usr/local/bin/php /usr/bin/php &&\ usermod -s /bin/bash root &&\ echo 'shell "/bin/bash"' >> /root/.screenrc + echo -e "syntax on\nfiletype plugin indent on\nset tabstop=4\nset shiftwidth=4\nset expandtab" > /root/.vimrc + ENV COMPOSER_ALLOW_SUPERUSER=1 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/vendor/bin LC_ALL=C.utf8 LANG=C.utf8 RUN composer require --no-update acdh-oeaw/arche-ingest &&\ composer require --no-update acdh-oeaw/repo-file-checker &&\