Skip to content

Commit 134045f

Browse files
committed
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2 parents b6b6a3e + b62714d commit 134045f

File tree

5 files changed

+10
-469
lines changed

5 files changed

+10
-469
lines changed

Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ autoconf \
4040
libc-dev \
4141
libldap-common \
4242
pkg-config \
43-
libmcrypt-dev \
4443
php8.3-dev \
4544
ca-certificates \
4645
unzip \
@@ -51,11 +50,6 @@ dnsutils \
5150
RUN curl -L -O https://github.com/pear/pearweb_phars/raw/master/go-pear.phar
5251
RUN php go-pear.phar
5352

54-
RUN pecl install mcrypt
55-
56-
RUN bash -c "echo extension=/usr/lib/php/20210902/mcrypt.so > /etc/php/8.3/mods-available/mcrypt.ini"
57-
58-
RUN phpenmod mcrypt
5953
RUN phpenmod gd
6054
RUN phpenmod bcmath
6155

app/Console/Commands/RecryptFromMcrypt.php

Lines changed: 0 additions & 157 deletions
This file was deleted.

app/LegacyEncrypter/BaseEncrypter.php

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)