Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build 7.0 on travis ci #16

Merged
merged 3 commits into from Jan 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
91 changes: 1 addition & 90 deletions .gitignore
@@ -1,91 +1,2 @@
# Created by .ignore support plugin (hsz.mobi)
### Windows template
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk
### macOS template
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/workspace.xml
.idea/tasks.xml

# Sensitive or high-churn files:
.idea/dataSources/
.idea/dataSources.ids
.idea/dataSources.xml
.idea/dataSources.local.xml
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml

# Gradle:
.idea/gradle.xml
.idea/libraries

# Mongo Explorer plugin:
.idea/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

.idea/
16 changes: 0 additions & 16 deletions .idea/docker-php-dev.iml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

18 changes: 18 additions & 0 deletions .travis.yml
@@ -0,0 +1,18 @@
language: php
php:
- 7.0

services:
- docker

install:
- docker build -t php .

script:
- bash ./test.sh php

branches:
only:
- alpine
- /^(latest|fpm)(-alpine)?$/
- /^[0-9.]+(-(latest|fpm))?(-alpine)?$/
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -6,4 +6,4 @@ ENV XDEBUG_VERSION 2.5.0
ENV XDEBUG_SHA1 0d31602a6ee2ba6d2e18a6db79bdb9a2a706bcd9

# Set PHP config
COPY config/*.ini /usr/local/etc/php/conf.d/
COPY config/*.ini /usr/local/etc/php/conf.d/
19 changes: 19 additions & 0 deletions test.sh
@@ -0,0 +1,19 @@
#!/usr/bin/env bash

if [ $# = 0 ]; then
echo "USAGE: test.sh image-name";
echo ""
echo " - image-name: Name of docker image to run tests against"
exit 1
fi

set -x

# PHP is avaialble
docker run --rm "$1" php -v
# Xdebug is installed
docker run --rm "$1" php -i | grep "xdebug support"
# Xdebug is enabled
docker run --rm "$1" php -i | grep "xdebug support => enabled"
# error_reporting = E_ALL
docker run --rm "$1" php -i | grep "error_reporting => 32767"