Skip to content
This repository was archived by the owner on Nov 16, 2022. It is now read-only.

Commit e44326d

Browse files
authored
Merge pull request #32 from ibrunotome/issue/#25
chore: upgrade to laravel 8.x
2 parents feb36cc + ad74285 commit e44326d

File tree

211 files changed

+4092
-3375
lines changed

Some content is hidden

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

211 files changed

+4092
-3375
lines changed

.k8s/06-app-deployment.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
args:
3131
- -c
3232
- |
33-
sleep 12
33+
sleep 5
3434
php artisan optimize
3535
php artisan view:cache
3636
ln -s public html
@@ -42,17 +42,17 @@ spec:
4242
ports:
4343
- containerPort: 9000
4444
readinessProbe:
45-
initialDelaySeconds: 20
46-
periodSeconds: 10
45+
initialDelaySeconds: 5
46+
periodSeconds: 5
4747
timeoutSeconds: 5
4848
failureThreshold: 3
4949
successThreshold: 1
5050
tcpSocket:
5151
port: 9000
5252
resources:
5353
requests:
54-
cpu: 50m
55-
memory: 320Mi
54+
cpu: 100m
55+
memory: 512Mi
5656
volumeMounts:
5757
- name: static
5858
mountPath: /static
@@ -68,8 +68,8 @@ spec:
6868
"-credential_file=/secrets/cloudsql/cloudsqlproxy.json"]
6969
resources:
7070
requests:
71-
cpu: 2m
72-
memory: 8Mi
71+
cpu: 10m
72+
memory: 12Mi
7373
volumeMounts:
7474
- name: cloudsql-instance-credentials
7575
mountPath: /secrets/cloudsql

.k8s/09-queue-deployment.yaml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,24 @@ spec:
3030
args:
3131
- -c
3232
- |
33-
sleep 12
33+
sleep 5
3434
php artisan migrate --force
35-
php artisan config:cache
35+
php artisan optimize
36+
php artisan view:cache
37+
ln -s public html
38+
ln -s /var/www /usr/share/nginx
39+
cp -r /var/www/public/. /static
3640
php artisan horizon --quiet
3741
envFrom:
3842
- secretRef:
3943
name: env
4044
resources:
4145
requests:
42-
cpu: 50m
43-
memory: 320Mi
46+
cpu: 100m
47+
memory: 512Mi
48+
volumeMounts:
49+
- name: static
50+
mountPath: /static
4451

4552
- name: cloudsql-proxy
4653
image: gcr.io/cloudsql-docker/gce-proxy:latest
@@ -49,14 +56,18 @@ spec:
4956
"-credential_file=/secrets/cloudsql/cloudsqlproxy.json"]
5057
resources:
5158
requests:
52-
cpu: 2m
53-
memory: 8Mi
59+
cpu: 10m
60+
memory: 12Mi
5461
volumeMounts:
5562
- name: cloudsql-instance-credentials
5663
mountPath: /secrets/cloudsql
5764
readOnly: true
5865

5966
volumes:
67+
- name: static
68+
nfs:
69+
server: nfs-server.seguidores.svc.cluster.local
70+
path: "/static"
6071
- name: cloudsql-instance-credentials
6172
secret:
6273
secretName: cloudsql-instance-credentials

.k8s/11-schedule-deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
resources:
3535
requests:
3636
cpu: 10m
37-
memory: 32Mi
37+
memory: 64Mi
3838

3939
- name: cloudsql-proxy
4040
image: gcr.io/cloudsql-docker/gce-proxy:latest
@@ -43,8 +43,8 @@ spec:
4343
"-credential_file=/secrets/cloudsql/cloudsqlproxy.json"]
4444
resources:
4545
requests:
46-
cpu: 1m
47-
memory: 8Mi
46+
cpu: 10m
47+
memory: 12Mi
4848
volumeMounts:
4949
- name: cloudsql-instance-credentials
5050
mountPath: /secrets/cloudsql

.k8s/could-help-if-you-are-using-apache/06-app-deployment.yaml renamed to .k8s/can-help-if-you-are-using-apache/06-app-deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ spec:
4040
- containerPort: 8080
4141
resources:
4242
requests:
43-
cpu: 80m
44-
memory: 320Mi
43+
cpu: 100m
44+
memory: 512Mi
4545

4646
- name: cloudsql-proxy
4747
image: gcr.io/cloudsql-docker/gce-proxy:latest
@@ -50,8 +50,8 @@ spec:
5050
"-credential_file=/secrets/cloudsql/cloudsqlproxy.json"]
5151
resources:
5252
requests:
53-
cpu: 2m
54-
memory: 8Mi
53+
cpu: 10m
54+
memory: 12Mi
5555
volumeMounts:
5656
- name: cloudsql-instance-credentials
5757
mountPath: /secrets/cloudsql

.k8s/could-help-if-you-are-using-apache/Dockerfile renamed to .k8s/can-help-if-you-are-using-apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM composer:1.9.0 as build
1+
FROM composer:2.0.12 as build
22
WORKDIR /app
33
COPY . /app
44
RUN composer install --prefer-dist --classmap-authoritative --no-dev
55

6-
FROM php:7.4.3-apache-buster
6+
FROM php:8.0.3-apache-buster
77
RUN docker-php-ext-install pdo pdo_pgsql pdo_mysql && pecl install redis
88

99
COPY --from=build /app /var/www/

.k8s/could-help-if-you-are-using-apache/php.ini renamed to .k8s/can-help-if-you-are-using-apache/php.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,6 +1888,7 @@ opcache.enable = 1
18881888
; Determines if Zend OPCache is enabled for the CLI version of PHP
18891889
opcache.enable_cli = 1
18901890

1891+
opcache.jit_buffer_size=100M
18911892
;opcache.preload=/var/www/storage/preload.php
18921893
;opcache.preload_user=www-data
18931894

@@ -2016,6 +2017,3 @@ zend_optimizerplus.enable_file_override = 1
20162017
; End:
20172018

20182019
extension = redis.so
2019-
extension = decimal.so
2020-
extension = grpc.so
2021-
extension = protobuf.so

.k8s/could-help-if-you-are-using-nginx/Dockerfile renamed to .k8s/can-help-if-you-are-using-nginx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ibrunotome/php:7.4-fpm
1+
FROM ibrunotome/php:8.0-fpm
22

33
ARG COMPOSER_FLAGS
44

.k8s/could-help-if-you-are-using-nginx/php.ini renamed to .k8s/can-help-if-you-are-using-nginx/php.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,6 +1888,7 @@ opcache.enable = 1
18881888
; Determines if Zend OPCache is enabled for the CLI version of PHP
18891889
opcache.enable_cli = 1
18901890

1891+
opcache.jit_buffer_size=100M
18911892
;opcache.preload=/var/www/storage/preload.php
18921893
;opcache.preload_user=www-data
18931894

@@ -2016,6 +2017,3 @@ zend_optimizerplus.enable_file_override = 1
20162017
; End:
20172018

20182019
extension = redis.so
2019-
extension = decimal.so
2020-
extension = grpc.so
2021-
extension = protobuf.so

0 commit comments

Comments
 (0)