Skip to content

Commit 6b86f45

Browse files
committed
Merge branch 'release/0.15.0'
2 parents 16d5fc2 + 2a5dbdd commit 6b86f45

File tree

6 files changed

+41
-2
lines changed

6 files changed

+41
-2
lines changed

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "docker"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
reviewers:
8+
- krns
9+
- pehbehbeh
10+
assignees:
11+
- pehbehbeh

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.4.11-fpm-alpine3.11
1+
FROM php:7.4.13-fpm-alpine3.11
22

33
ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
44
PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Docker Build Status](https://img.shields.io/docker/cloud/build/sourceboat/docker-laravel.svg?style=flat-square)](https://hub.docker.com/r/sourceboat/docker-laravel/builds/)
44
[![Release](https://img.shields.io/github/release/sourceboat/docker-laravel.svg?style=flat-square)](https://github.com/sourceboat/docker-laravel/releases)
55
[![Docker Pulls](https://img.shields.io/docker/pulls/sourceboat/docker-laravel.svg?style=flat-square)](https://hub.docker.com/r/sourceboat/docker-laravel/)
6-
[![MicroBadger Size](https://img.shields.io/microbadger/image-size/sourceboat/docker-laravel.svg?style=flat-square)](https://microbadger.com/images/sourceboat/docker-laravel)
6+
[![Image Size](https://img.shields.io/docker/image-size/sourceboat/docker-laravel?style=flat-square)](https://microbadger.com/images/sourceboat/docker-laravel)
77
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/sourceboat/docker-laravel.svg?style=flat-square)](https://microbadger.com/images/sourceboat/docker-laravel)
88

99
A highly opinionated docker image which aims to be perfectly suited to run our Laravel applications.

docker-compose.test.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: '3.7'
2+
services:
3+
sut:
4+
build: .
5+
command: /root/test/test-command.sh
6+
environment:
7+
- STARTUP_COMMAND1=php --version
8+
- STARTUP_COMMAND2=composer --version
9+
- STARTUP_COMMAND3=chmod +x /root/test/test-command.sh
10+
volumes:
11+
- ./test:/root/test

root/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ set -e
55

66
# make sure Laravel can write its own files
77
mkdir -p /opt/app/storage/logs/
8+
mkdir -p /opt/app/bootstrap/cache
9+
810
touch /opt/app/storage/logs/laravel.log
911
touch /opt/app/storage/logs/worker.log
1012
chown www-data:www-data -R /opt/app/storage

test/test-command.sh

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
# clean the app folder
5+
cd /opt/
6+
rm -rf app
7+
8+
# create laravel project into app
9+
composer create-project --prefer-dist laravel/laravel app
10+
11+
# start services in the background
12+
runsvdir /etc/service &
13+
14+
# check if the services are available
15+
wait-for-it.sh --host=localhost --port=8080

0 commit comments

Comments
 (0)