Skip to content

Commit e66209f

Browse files
committed
Make new strucure for project and remove laravel files
1 parent 0385a0a commit e66209f

File tree

96 files changed

+60
-11423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+60
-11423
lines changed

.editorconfig

Lines changed: 0 additions & 18 deletions
This file was deleted.

.env

Lines changed: 4 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,4 @@
1-
APP_NAME=Laravel
2-
APP_ENV=local
3-
APP_KEY=base64:dgiSeGyZXg9muGrrel4/c8xq44HckxhYYK+4ZYPoj9w=
4-
APP_DEBUG=true
5-
APP_URL=http://localhost
6-
7-
LOG_CHANNEL=stack
8-
LOG_DEPRECATIONS_CHANNEL=null
9-
LOG_LEVEL=debug
10-
11-
DB_CONNECTION=mysql
12-
DB_HOST=127.0.0.1
13-
DB_PORT=3306
14-
DB_DATABASE=laravel
15-
DB_USERNAME=root
16-
DB_PASSWORD=root
17-
18-
BROADCAST_DRIVER=log
19-
CACHE_DRIVER=file
20-
FILESYSTEM_DISK=local
21-
QUEUE_CONNECTION=sync
22-
SESSION_DRIVER=file
23-
SESSION_LIFETIME=120
24-
25-
MEMCACHED_HOST=127.0.0.1
26-
27-
REDIS_HOST=127.0.0.1
28-
REDIS_PASSWORD=null
29-
REDIS_PORT=6379
30-
31-
MAIL_MAILER=smtp
32-
MAIL_HOST=mailhog
33-
MAIL_PORT=1025
34-
MAIL_USERNAME=null
35-
MAIL_PASSWORD=null
36-
MAIL_ENCRYPTION=null
37-
MAIL_FROM_ADDRESS="hello@example.com"
38-
MAIL_FROM_NAME="${APP_NAME}"
39-
40-
AWS_ACCESS_KEY_ID=
41-
AWS_SECRET_ACCESS_KEY=
42-
AWS_DEFAULT_REGION=us-east-1
43-
AWS_BUCKET=
44-
AWS_USE_PATH_STYLE_ENDPOINT=false
45-
46-
PUSHER_APP_ID=
47-
PUSHER_APP_KEY=
48-
PUSHER_APP_SECRET=
49-
PUSHER_HOST=
50-
PUSHER_PORT=443
51-
PUSHER_SCHEME=https
52-
PUSHER_APP_CLUSTER=mt1
53-
54-
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
55-
VITE_PUSHER_HOST="${PUSHER_HOST}"
56-
VITE_PUSHER_PORT="${PUSHER_PORT}"
57-
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
58-
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
1+
DB_ROOT_PASSWORD=changeme
2+
DB_DATABASE=test
3+
DB_USERNAME=admin
4+
DB_PASSWORD=changeme

.env.example

Lines changed: 0 additions & 58 deletions
This file was deleted.

.gitattributes

Lines changed: 0 additions & 11 deletions
This file was deleted.

.styleci.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

Dockerfile

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
1-
FROM php:8.1.0-fpm
2-
COPY composer.lock composer.json /var/www/
3-
WORKDIR /var/www
1+
FROM php:8.0-fpm
2+
43
RUN apt-get update && apt-get install -y \
5-
build-essential \
6-
libpng-dev \
7-
libjpeg62-turbo-dev \
8-
libfreetype6-dev \
9-
locales \
4+
libonig-dev \
5+
libzip-dev \
106
zip \
11-
jpegoptim optipng pngquant gifsicle \
12-
vim \
137
unzip \
14-
git \
15-
oniguruma\
16-
curl
17-
RUN apt-get clean && rm -rf /var/lib/apt/lists/*
18-
RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl
19-
RUN docker-php-ext-configure gd --with-gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/
20-
RUN docker-php-ext-install gd
21-
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
22-
RUN groupadd -g 1000 www
23-
RUN useradd -u 1000 -ms /bin/bash -g www www
24-
COPY . /var/www
25-
COPY --chown=www:www . /var/www
26-
RUN chmod o+w ./storage/ -R
27-
USER www
28-
EXPOSE 9000
29-
CMD ["php-fpm"]
8+
&& docker-php-ext-install pdo_mysql mbstring zip
9+
10+
WORKDIR /var/www/html
11+
12+
COPY --chown=www-data:www-data ./src /var/www/html
13+
14+
CMD php artisan serve --host=0.0.0.0 --port=8000
15+
16+
EXPOSE 8000

docker-compose.yml

Lines changed: 35 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,41 @@
11
version: '3'
22
services:
3-
mariadb:
4-
image: docker.io/bitnami/mariadb:latest
3+
app:
4+
build:
5+
context: .
6+
dockerfile: Dockerfile
7+
volumes:
8+
- ./src:/var/www/html
9+
depends_on:
10+
- db
11+
env_file:
12+
- .env
13+
db:
14+
image: mariadb:latest
15+
volumes:
16+
- db_data:/var/lib/mysql
517
environment:
6-
# ALLOW_EMPTY_PASSWORD is recommended only for development.
7-
- ALLOW_EMPTY_PASSWORD=yes
8-
- MARIADB_USER=bn_myapp
9-
- MARIADB_DATABASE=bitnami_myapp
10-
myapp:
11-
image: docker.io/bitnami/laravel:latest
18+
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
19+
MYSQL_DATABASE: ${DB_DATABASE}
20+
MYSQL_USER: ${DB_USERNAME}
21+
MYSQL_PASSWORD: ${DB_PASSWORD}
22+
nginx:
23+
image: nginx:latest
1224
ports:
13-
- '8000:8000'
14-
environment:
15-
- DB_HOST=mariadb
16-
- DB_PORT=3306
17-
- DB_USERNAME=bn_myapp
18-
- DB_DATABASE=bitnami_myapp
25+
- '80:80'
1926
volumes:
20-
- './my-project:/app'
27+
- ./nginx/conf.d:/etc/nginx/conf.d
28+
- ./src:/var/www/html
2129
depends_on:
22-
- mariadb
23-
#app:
24-
# build:
25-
# context: .
26-
# dockerfile: Dockerfile
27-
# image: php:8.1.0-fpm
28-
# container_name: app
29-
# restart: unless-stopped
30-
# tty: true
31-
# environment:
32-
# SERVICE_NAME: app
33-
# SERVICE_TAGS: dev
34-
# working_dir: /var/www
35-
# volumes:
36-
# - ./:/var/www
37-
# - ./php/local.ini:/usr/local/etc/php/conf.d/local.ini
38-
# networks:
39-
# - app-network
40-
#webserver:
41-
# image: nginx:alpine
42-
# container_name: webserver
43-
# restart: unless-stopped
44-
# tty: true
45-
# ports:
46-
# - "80:80"
47-
# - "443:443"
48-
# volumes:
49-
# - ./:/var/www
50-
# - ./nginx/conf.d/:/etc/nginx/conf.d/
51-
# networks:
52-
# - app-network
53-
#db:
54-
# image: mysql:5.7.22
55-
# container_name: db
56-
# restart: unless-stopped
57-
# tty: true
58-
# ports:
59-
# - "3306:3306"
60-
# environment:
61-
# MYSQL_DATABASE: laravel
62-
# MYSQL_ROOT_PASSWORD: your_mysql_root_password
63-
# SERVICE_TAGS: dev
64-
# SERVICE_NAME: mysql
65-
# volumes:
66-
# - dbdata:/var/lib/mysql/
67-
# - ./mysql/my.cnf:/etc/mysql/my.cnf
68-
# networks:
69-
# - app-network
70-
#phpmyadmin:
71-
# image: phpmyadmin/phpmyadmin:latest
72-
# ports:
73-
# - 8080:80
74-
# environment:
75-
# PMA_HOST: db
76-
# depends_on:
77-
# - db
78-
#networks:
79-
# app-network:
80-
# driver: bridge
81-
#volumes:
82-
# dbdata:
83-
# driver: local
30+
- app
31+
phpmyadmin:
32+
image: phpmyadmin/phpmyadmin:latest
33+
ports:
34+
- '8080:80'
35+
depends_on:
36+
- db
37+
environment:
38+
PMA_HOST: db
39+
MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
40+
volumes:
41+
db_data:

images/laravel.png

-103 KB
Binary file not shown.

my-project/.buildcomplete

Whitespace-only changes.

my-project/.editorconfig

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)