Skip to content
This repository was archived by the owner on Apr 1, 2021. It is now read-only.

Commit dbddbdc

Browse files
adenvtadenvt
committed
Merge branch 'release/1.0.0-rc.2'
2 parents 0776090 + 04858ea commit dbddbdc

File tree

8 files changed

+529
-219
lines changed

8 files changed

+529
-219
lines changed

‎.env.travis

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
APP_NAME=Laravel
2+
APP_ENV=testing
3+
APP_KEY=base64:pE3IKKotAdEhrvI9OfUlDsvtlVuzlxZGkiFGbgI7s9I=
4+
APP_DEBUG=false
5+
APP_URL=http://localhost
6+
7+
LOG_CHANNEL=stack
8+
9+
DB_CONNECTION=mysql
10+
DB_HOST=127.0.0.1
11+
DB_PORT=3306
12+
DB_DATABASE=homestead
13+
DB_USERNAME=homestead
14+
DB_PASSWORD=secret
15+
16+
BROADCAST_DRIVER=log
17+
CACHE_DRIVER=file
18+
SESSION_DRIVER=file
19+
SESSION_LIFETIME=120
20+
QUEUE_DRIVER=sync
21+
22+
REDIS_HOST=127.0.0.1
23+
REDIS_PASSWORD=null
24+
REDIS_PORT=6379
25+
26+
MAIL_DRIVER=smtp
27+
MAIL_HOST=smtp.mailtrap.io
28+
MAIL_PORT=2525
29+
MAIL_USERNAME=null
30+
MAIL_PASSWORD=null
31+
MAIL_ENCRYPTION=null
32+
33+
PUSHER_APP_ID=
34+
PUSHER_APP_KEY=
35+
PUSHER_APP_SECRET=
36+
PUSHER_APP_CLUSTER=mt1
37+
38+
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
39+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
40+
41+
# API_URL=
42+
# API_USERNAME=
43+
# API_PASSWORD=

‎.travis.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
sudo: required
2+
3+
language: minimal
4+
5+
services:
6+
- docker
7+
8+
before_install:
9+
- cp .env.travis .env
10+
11+
install:
12+
- docker-compose up -d --build prod
13+
14+
script:
15+
- curl --silent --fail --show-error http://127.0.0.1:88 > $HOME/index.html
16+
17+
after_failure:
18+
- cat $HOME/index.html
19+
- docker-compose exec prod bash -c "tail /var/log/nginx/access.log"
20+
- docker-compose exec prod bash -c "tail /var/log/nginx/error.log"

‎Dockerfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ COPY package-lock.json /var/www
88
RUN npm ci
99

1010
COPY . /var/www
11-
# RUN npm run prod
11+
RUN npm run prod
1212
RUN rm -rf /var/www/node_modules/
1313

1414
FROM php:7.2-fpm AS server
@@ -49,19 +49,21 @@ COPY deploy/web/site.conf /etc/nginx/sites-available/default
4949
COPY deploy/web/nginx.conf /etc/nginx/nginx.conf
5050
COPY deploy/web/mime.types /etc/nginx/mime.types
5151
COPY deploy/web/php.ini /usr/local/etc/php/php.ini
52-
COPY --from=compiler /var/www /var/www
5352

5453
# Force HTTPS
5554
ARG FORCE_HTTPS=false
5655
RUN if [ ${FORCE_HTTPS} = true ]; then \
5756
sed -i 's/# fastcgi_param HTTPS/fastcgi_param HTTPS/' /etc/nginx/sites-available/default \
5857
;fi
5958

59+
COPY --from=compiler /var/www /var/www
6060
RUN composer dump-autoload --no-dev --optimize
61-
RUN chown -R www-data:www-data /var/www
62-
RUN php artisan config:cache \
61+
RUN grep -q "APP_KEY=" .env || echo "APP_KEY=" >> .env
62+
RUN php artisan key:generate \
63+
&& php artisan config:cache \
6364
&& php artisan route:cache \
6465
&& php artisan view:cache
66+
RUN chown -R www-data:www-data /var/www
6567
RUN rm -rf /var/www/html/ /var/www/deploy/
6668

6769
EXPOSE 80 443

‎README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
> Laravel + CoreUI + Vue Boilerplate
44
55
[![PHP version](https://badge.fury.io/ph/adenvt%2Flaravel-coreui-vue.svg)](https://badge.fury.io/ph/adenvt%2Flaravel-coreui-vue)
6+
[![Build Status](https://travis-ci.com/adenvt/laravel-coreui-vue.svg?branch=master)](https://travis-ci.com/adenvt/laravel-coreui-vue)
67

78
## What's inside
89
* [Laravel][laravel] 5.7, A PHP framework for web artisans
@@ -28,7 +29,7 @@
2829
* For Ubuntu, require `apt-get install libpng16-dev`, [see](https://github.com/imagemin/imagemin-mozjpeg/issues/28)
2930

3031
## How to Install
31-
* Install using composer (no need to cloning)
32+
* Install using composer (doesn't need to clone)
3233
```bash
3334
composer create-project --prefer-dist adenvt/laravel-coreui-vue project_name
3435
```
@@ -57,8 +58,7 @@ npm run hot
5758
## Using Docker Compose
5859

5960
### For Development
60-
61-
* Create and run Container
61+
* Create and start Container
6262
```bash
6363
docker-compose up -d dev
6464
```
@@ -73,6 +73,7 @@ docker-compose exec dev bash
7373
composer install
7474
npm install
7575
```
76+
7677
* Compile Static Asset
7778
```bash
7879
## Single run compile
@@ -87,13 +88,12 @@ npm run hot
8788
* Open browser, goto `http://localhost:8888`
8889

8990
### For Production
90-
* Create and run Container
91+
* Create and start Container
9192
```
9293
docker-compose up -d prod
9394
```
94-
* Open browser, goto `http://localhost:88`
95-
9695

96+
* Open browser, goto [http://localhost:88](http://localhost:88)
9797

9898
## License
9999
This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details

‎index.html

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7+
<meta name="viewport" content="width=device-width, initial-scale=1">
8+
<meta name="theme-color" content="#36A2CD">
9+
10+
<!-- CSRF Token -->
11+
<meta name="csrf-token" content="9HlU2MKH9iFgV9f0NWUQNxhh4DhpUlVEFDtokjtm">
12+
13+
<title>Laravel</title>
14+
15+
<link rel="manifest" href="http://127.0.0.1:88/manifest.json">
16+
<link rel="shortcut icon" href="http://127.0.0.1:88/favicon.png">
17+
18+
<!-- Fonts -->
19+
<link rel="dns-prefetch" href="https://fonts.gstatic.com">
20+
<link href="https://fonts.googleapis.com/css?family=Raleway:300,400,600" rel="stylesheet" type="text/css">
21+
22+
<!-- Styles -->
23+
<link rel="stylesheet" href="http://127.0.0.1:88/css/app.css?id=cad9d939a9d035d10d6f">
24+
</head>
25+
26+
<body>
27+
<div id="app">
28+
<noscript>
29+
<div class="app flex-row align-items-center">
30+
<div class="container">
31+
<div class="row justify-content-center">
32+
<div class="col-md-6 p-3">
33+
<h1 class="text-center text-md-left">
34+
<i class="fa fa-warning fa-2x"></i>
35+
</h1>
36+
<h4 class="pt-3">Browser not Support</h4>
37+
<p class="text-muted">
38+
Try other browser which have Javascript Support. Recommendation is
39+
<a href="https://www.google.com/chrome/?brand=CHBD&gclid=CjwKCAjw6-_eBRBXEiwA-5zHaa78eJ_HfOScWr1D4PzHFZY2k2zRHc9pcHZ9gvAaHbljCsSC1gv0jBoCKIUQAvD_BwE&gclsrc=aw.ds">
40+
Google Chrome
41+
</a>
42+
or
43+
<a href="https://www.mozilla.org/en-US/">
44+
Mozilla Firefox
45+
</a>
46+
<br>
47+
<a class="btn btn-primary mt-3" href="http://127.0.0.1:88">
48+
Reload Page
49+
</a>
50+
</p>
51+
</div>
52+
</div>
53+
</div>
54+
</div>
55+
</noscript>
56+
</div>
57+
<script defer src="http://127.0.0.1:88/js/manifest.js?id=40dcfff9d09d402daf38"></script>
58+
<script defer src="http://127.0.0.1:88/js/vendor.js?id=299ac5df9e495d9aa005"></script>
59+
<script defer src="http://127.0.0.1:88/js/app.js?id=805a20f7212ab647cac7"></script>
60+
</body>
61+
62+
</html>

0 commit comments

Comments
 (0)