Skip to content

Commit

Permalink
composer.json: remove unneeded dependency (it's in arche-lib-ingest now)
Browse files Browse the repository at this point in the history
docker/Dockerfile: include php xdebug and vim configuration
  • Loading branch information
zozlak committed Dec 3, 2024
1 parent 8bb4b3f commit f8bfa23
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
Expand Down
4 changes: 3 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&\
Expand Down

0 comments on commit f8bfa23

Please sign in to comment.