Skip to content

Commit

Permalink
bump dependency versions; fix s3 uploads
Browse files Browse the repository at this point in the history
  • Loading branch information
Nakiami committed May 7, 2018
1 parent 6df4af9 commit c2c93cf
Show file tree
Hide file tree
Showing 4 changed files with 367 additions and 1,792 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ RUN apt-get update && apt-get install -y \
git \
libssl-dev \
libcurl4-openssl-dev \
pkg-config
pkg-config \
zip \
unzip

RUN docker-php-ext-install mbstring curl pdo pdo_mysql

Expand Down
50 changes: 25 additions & 25 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
{
"name": "Nakiami/mellivora",
"type": "project",
"description": "Mellivora is a CTF engine written in PHP",
"homepage": "https://github.com/Nakiami/mellivora",
"license": "GPL-3.0",
"minimum-stability": "dev",
"authors": [
{
"name": "Nakiami",
"homepage": "https://github.com/Nakiami/"
}
],
"config": {
"vendor-dir": "include/thirdparty/composer/vendor"
},
"require": {
"ircmaxell/password-compat": "dev-master",
"ircmaxell/random-lib": "1.0.*@dev",
"google/recaptcha": "~1.1",
"phpmailer/phpmailer": "dev-master",
"pear/Cache_Lite": "dev-master",
"aws/aws-sdk-php": "2.*"
},
"require-dev": {
"codeception/codeception": "*"
"name": "Nakiami/mellivora",
"type": "project",
"description": "Mellivora is a CTF engine written in PHP",
"homepage": "https://github.com/Nakiami/mellivora",
"license": "GPL-3.0",
"minimum-stability": "dev",
"authors": [
{
"name": "Nakiami",
"homepage": "https://github.com/Nakiami/"
}
],
"config": {
"vendor-dir": "include/thirdparty/composer/vendor"
},
"require": {
"ircmaxell/password-compat": "dev-master",
"ircmaxell/random-lib": "1.2.*",
"google/recaptcha": "~1.1",
"phpmailer/phpmailer": "5.*",
"pear/Cache_Lite": "~1.8",
"aws/aws-sdk-php": "3.*"
},
"require-dev": {
"codeception/codeception": "*"
}
}
Loading

0 comments on commit c2c93cf

Please sign in to comment.