Skip to content

Commit

Permalink
Merge pull request #1 from pixeloven/update-php-74
Browse files Browse the repository at this point in the history
Update php 74
  • Loading branch information
ductiletoaster authored Sep 24, 2021
2 parents fab8135 + 5826252 commit 6557d69
Show file tree
Hide file tree
Showing 7 changed files with 4,284 additions and 2,255 deletions.
21 changes: 6 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
FROM php:7.2-cli-alpine
FROM php:7.4-cli-alpine

ARG BUILD_DATE
ARG VCS_REF

LABEL Maintainer="Brian Gebel <bgebel@gofundme.com>" \
Description="Lightweight php 7.2 container based on alpine with xDebug enabled & composer installed." \
org.label-schema.name="php-7.2-xdebug-alpine" \
org.label-schema.description="Lightweight php 7.2 container based on alpine with xDebug enabled & composer installed." \
LABEL Maintainer="Brian Gebel <brian@pixeloven.com>" \
Description="Lightweight php 7.4 container based on alpine with xDebug enabled & composer installed." \
org.label-schema.name="php-7.4-xdebug-alpine" \
org.label-schema.description="Lightweight php 7.4 container based on alpine with xDebug enabled & composer installed." \
org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.schema-version="1.0.0"

RUN apk update \
&& apk add --no-cache curl \
&& apk add --no-cache librdkafka autoconf build-base librdkafka-dev \
&& apk add --no-cache git \
&& apk add --no-cache openssh-client \
&& apk add --no-cache $PHPIZE_DEPS \
&& apk add --no-cache zlib-dev libmemcached-dev \
&& pecl install memcached \
&& pecl install xdebug-2.6.0 \
&& pecl install rdkafka \
&& docker-php-ext-enable memcached \
&& pecl install xdebug-3.0.4 \
&& docker-php-ext-enable xdebug \
&& docker-php-ext-enable rdkafka \
&& php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
&& php composer-setup.php \
&& php -r "unlink('composer-setup.php');" \
Expand Down
6 changes: 6 additions & 0 deletions NOTES.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
High level plan
1) Add support for laravel responder
2) Find/implement an appropriate JWT library for authentication protecting against common vulnerabilities.
3) Find/implmenent Paseto. https://github.com/paragonie/paseto for laravel
4) extend laravel native event system to support kafka more nautrally

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@ The quickest way to get setup is to fist ensure you have docker installed. Then
```
docker-compose build
```
This will create a php-7.2 docker image and container with everything we need to run and verify our code. Once complete we can run the composer through our newly minted container.
This will create a php-7.4 docker image and container with everything we need to run and verify our code. Once complete we can run the composer through our newly minted container.
```
docker-compose run php-7.2 composer install
docker-compose run php-7.4 composer install
```
## Code Quality Testing
There are two simple steps for verifying your changes.

### Testing
This compors alias can be found in the composer.json file under scripts. We utilizes PHPUnit for all testing.
```
docker-compose run php-7.2 composer test
docker-compose run php-7.4 composer test
```

#### Linting
This compors alias can be found in the composer.json file under scripts. We utilizes PHPCodesniffer for all liniting needs.
```
docker-compose run php-7.2 composer lint
docker-compose run php-7.4 composer lint
```

## Usage
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pool:
vmImage: 'ubuntu-20.04'

variables:
phpVersion: 7.2
phpVersion: 7.4

steps:
- script: |
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"type": "library",
"config": {
"platform": {
"php": "7.2"
"php": "7.4"
}
},
"require": {
"php": ">=7.2",
"laravel/lumen-framework": ">=5.5"
"php": ">=7.4",
"laravel/lumen-framework": ">=6.0"
},
"require-dev": {
"phpunit/phpunit": "8.5.15",
Expand Down
Loading

0 comments on commit 6557d69

Please sign in to comment.