Skip to content

Commit

Permalink
fix query string
Browse files Browse the repository at this point in the history
  • Loading branch information
noogen committed Oct 26, 2018
1 parent b14a071 commit 76e66f5
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 17 deletions.
8 changes: 3 additions & 5 deletions .docker/conf/site.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ server {
# allow for forcing ssl if necessary
include /var/www/public/ngin*.conf;

try_files $uri $uri/ /index.php;

location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ {
expires max;
}
try_files $uri $uri/ /index.php$is_args$args;
}

location ~ \.php$ {
Expand Down Expand Up @@ -60,6 +56,8 @@ server {
# block access to sensitive file extensions
location ~* \.(bak|conf|dist|fla|in[ci]|log|psd|sh|sql|sw[op]|cgi|env|yml|example)$ {
deny all;
log_not_found off;
access_log off;
}

# allow but don't log fav icon or robots txt
Expand Down
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ AWS_ACCESS_KEY_ID=
AWS_SECRET_ACCESS_KEY=
AWS_DEFAULT_REGION=
AWS_BUCKET_AUDIT=

L5_SWAGGER_GENERATE_ALWAYS=
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ This API give you the ability to quickly import hundred-of-thousands of rows. D
5. [Query Syntax](#query-syntax)
6. [Future Feature TODO](#todo)
7. [Q and A](#Q-and-A)
8. [Docker](#docker)

## Requirements
- PHP 7.1+
Expand Down Expand Up @@ -194,4 +195,10 @@ since our app will be accessing the database, Lumin would not have made a lot of
Again, see why Laravel explained above. PHP is also easy to deploy, similar to other langs mentioned above. We can simply deploy this on some cPanel or similar hosting and/or docker. Hey, we can even do serverless (https://read.acloud.guru/serverless-php-630bb3e950f5) and combine with Aurora Serverless Database for high scalability.

## Docker
See docker-compose.example.yml for demonstration. Simply rename to docker-compose.yml and run:
```
docker-compose up
```

# MIT
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 15 additions & 7 deletions docker-compose.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
- dbhost
networks:
- laratt-network
image: cyberduck/php-fpm-laravel:7.2
image: laradock/php-fpm:2.2-7.2
volumes:
- "./:/var/www"

Expand All @@ -38,12 +38,22 @@ services:
command: ["mysqld", "--innodb-buffer-pool-size=1G"]
environment:
- "MYSQL_ROOT_PASSWORD=secret"
- "MYSQL_DATABASE=homestead"
- "MYSQL_USER=laratt"
- "MYSQL_DATABASE=laratt"
- "MYSQL_USER=homestead"
- "MYSQL_PASSWORD=secret"
volumes:
- "./.docker/conf/my.cnf:/etc/mysql/my.cnf:ro"
- "./.docker/data/mysql:/var/lib/mysql:rw"
# The reason you want to physically mount /var/lib/mysql
# because I don't trust docker. There are instances
# when docker can become unresponsive and the only
# way to get it back is to start from scratch
# by deleting rm -rf /var/lib/docker/*
#
# Using docker volume means you will loose your data
# but redis is fine if we're just using it like
# memcache.


# The redis caching server.
# redis:
Expand All @@ -59,17 +69,15 @@ services:
# (Optional) A PHPMyAdmin web interface for the database.
# phpmyadmin:
# depends_on:
# - db
# - dbhost
# image: phpmyadmin/phpmyadmin
# restart: always
# ports:
# - 8080:80
# env_file:
# - ./config/mysql.env
# environment:
# PMA_HOST: db
# networks:
# - app-network
# - laratt-network

networks:
laratt-network:
Expand Down

0 comments on commit 76e66f5

Please sign in to comment.