Merge pull request #231 from silinternational/develop

Release 5.5.2

CHANGELOG.md

@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [5.5.2]
+### Fixed
+- Upgrade PHP to 7.4 again (but stay with Ubuntu base O/S)
+- Upgrade Ubuntu to 20.04
+- Upgrade Composer to 2
+- Switch from fxp's composer-asset-plugin to asset-packagist
+- Stop including syslog and Logentries-related files
+- Stop installing/using runny (since we don't log to syslog anymore)
+
 ## [5.5.1]
 ### Changed
 - Reverse the order of searching for a Google user, now use ID first

Dockerfile

@@ -1,11 +1,12 @@
-FROM silintl/php7:7.2
+FROM silintl/php7:7.4
 MAINTAINER Phillip Shipley <[email protected]>
 
-ENV REFRESHED_AT 2020-04-07
+ENV REFRESHED_AT 2020-06-09
 
 RUN apt-get update -y && \
     apt-get install -y php-memcache && \
-    apt-get clean
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /data
 

Makefile

@@ -22,7 +22,7 @@ composer:
 	docker-compose run --rm cli composer install
 
 composerupdate:
-	docker-compose run --rm cli bash -c "composer update && composer show -D > versions.json"
+	docker-compose run --rm cli bash -c "composer update && composer show -D --format=json > versions.json"
 
 email:
 	docker-compose up -d email

application/composer.json

@@ -2,6 +2,12 @@
   "name": "silinternational/idp-pw-api",
   "description": "Backend API for Identity Provider Password Management",
   "minimum-stability": "stable",
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://asset-packagist.org"
+    }
+  ],
   "require": {
     "php": ">=7.2",
     "ext-json": "*",