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.

Sign up for GitHub

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

Test jenkins #13

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Test jenkins #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
630a48b
Simple change
Jan 8, 2018
58125f8
Simple change
Jan 8, 2018
8186f1d
Testing changes
Jan 8, 2018
653194b
Added gitignore and sonarqube properties file
Jan 10, 2018
67f8c58
Test change
Jan 10, 2018
1cad836
Example change
cizal Jan 24, 2018
bbe03b8
Change for deloitte presentation
cizal Jan 24, 2018
3afd1bb
pull request test
cizal Jan 24, 2018
fca47e1
Testing the app
Jan 30, 2018
aea6335
Change
Jan 30, 2018
be3feef
Some change to be deployed
Jan 31, 2018
5d9f9db
Another change
Jan 31, 2018
9798331
Jenkinsfile test
Jan 31, 2018
a74149d
Merge pull request #1 from cizal/cizal-patch-1
cizal Jan 31, 2018
1245aad
Merge branch 'master' of github.com:cizal/ecs-demo-php-simple-app
Jan 31, 2018
6505bc0
Change
Jan 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.sonar*
.scanner*
10 changes: 10 additions & 0 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
pipeline {
agent { docker 'php' }
stages {
stage('build') {
steps {
sh 'php --version'
}
}
}
}
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Amazon ECS PHP Simple Demo App
Directions on how to launch this sample app on Amazon ECS can be found in the documentation: [Docker basics](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/docker-basics.html).
Directions on how to launch this sample app on Amazon ECS can be found in the documentation: [Docker basics](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/docker-basics.html). Testing branching
12 changes: 12 additions & 0 deletions sonar-project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# must be unique in a given SonarQube instance
sonar.projectKey=demo_php
# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
sonar.projectName=Demo PHP project
sonar.projectVersion=1.0

# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
# This property is optional if sonar.modules is set.
sonar.sources=.

# Encoding of the source code. Default is default system encoding
#sonar.sourceEncoding=UTF-8
6 changes: 3 additions & 3 deletions src/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<body>
<div class="container">
<div class="hero-unit">
<h1>Simple PHP App</h1>
<h2>Congratulations</h2>
<p>Your PHP application is now running on a container in Amazon ECS.</p>
<h1>Let's do a another change</h1>
<h2>Sample app</h2>
<p>The application is running on a container in Amazon ECS.</p>
<p>The container is running PHP version <?php echo phpversion(); ?>.</p>
<?php
$myfile = fopen("/var/www/my-vol/date", "r") or die("");
Expand Down