Skip to content

Commit 2405fea

Browse files
lotyplotyp
authored
Merge pull request #58 from wayofdev/feat/protobuf
2 parents 365a1ed + 7f5127f commit 2405fea

File tree

5 files changed

+54
-28
lines changed

5 files changed

+54
-28
lines changed

‎Makefile

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
export DOCKER_BUILDKIT ?= 1
55
export COMPOSE_DOCKER_CLI_BUILD ?= 1
66

7+
# Docker binary to use, when executing docker tasks
8+
DOCKER ?= docker
9+
710
IMAGE_NAMESPACE ?= wayofdev/php-base
811
IMAGE_TEMPLATE ?= 8.3-fpm-alpine
912
IMAGE_TAG ?= $(IMAGE_NAMESPACE):$(IMAGE_TEMPLATE)-latest
@@ -13,7 +16,26 @@ CACHE_FROM ?= $(IMAGE_TAG)
1316
OS ?= $(shell uname)
1417
CURRENT_DIR ?= $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
1518

16-
19+
# Yamllint docker image
20+
YAML_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \
21+
-v $(PWD):/data \
22+
cytopia/yamllint:latest \
23+
-c ./.github/.yamllint.yaml \
24+
-f colored .
25+
26+
ACTION_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \
27+
-v $(shell pwd):/repo \
28+
--workdir /repo \
29+
rhysd/actionlint:latest \
30+
-color
31+
32+
MARKDOWN_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \
33+
-v $(shell pwd):/app \
34+
--workdir /app \
35+
davidanson/markdownlint-cli2-rules:latest \
36+
--config ".github/.markdownlint.json"
37+
38+
#
1739
# Self documenting Makefile code
1840
# ------------------------------------------------------------------------------------
1941
ifneq ($(TERM),)

‎README.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<br>
2-
3-
<div align="center">
4-
<img width="456" src="https://raw.githubusercontent.com/wayofdev/docker-php-base/master/assets/logo.gh-light-mode-only.png#gh-light-mode-only" alt="WayOfDev Logo in light mode">
5-
<img width="456" src="https://raw.githubusercontent.com/wayofdev/docker-php-base/master/assets/logo.gh-dark-mode-only.png#gh-dark-mode-only" alt="WayOfDev logo in dark mode">
6-
</div>
7-
8-
<br>
9-
10-
<br>
1+
<p align="center">
2+
<br>
3+
<a href="https://wayof.dev" target="_blank">
4+
<picture>
5+
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/wayofdev/.github/master/assets/logo.gh-dark-mode-only.png">
6+
<img width="400" src="https://raw.githubusercontent.com/wayofdev/.github/master/assets/logo.gh-light-mode-only.png" alt="WayOfDev Logo">
7+
</picture>
8+
</a>
9+
<br>
10+
</p>
1111

1212
<div align="center">
1313
<a href="https://actions-badge.atrox.dev/wayofdev/docker-php-base/goto"><img alt="Build Status" src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fwayofdev%2Fdocker-php-base%2Fbadge&style=flat-square"/></a>
@@ -41,7 +41,9 @@ Enabled extensions by default:
4141
| [memcached](https://pecl.php.net/package/memcached) | Functions for interfacing with Memcached | pecl |
4242
| [decimal](https://pecl.php.net/package/decimal) | Arbitrary precision floating-point decimal | pecl |
4343
| [amqp](https://pecl.php.net/package/amqp) | Advanced Message Queuing Protocol (AMQP) library | pecl |
44-
| [yaml](https://pecl.php.net/package/yaml) | YAML (YAML Ain't Markup Language) library | pecl |
44+
| [yaml](https://pecl.php.net/package/yaml) | YAML library | pecl |
45+
| [grpc](https://pecl.php.net/package/grpc) | gRPC library | pecl |
46+
| [protobuf](https://pecl.php.net/package/protobuf) | Protocol Buffers library | pecl |
4547

4648
<br>
4749

‎src/Dockerfiles/base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ COPY --chown=www-data ./configs/php.ini /usr/local/etc/php/conf.d/php.ini
4141
RUN set -eux; \
4242
apk -U upgrade -a \
4343
{% if 'supervisord' == php_type %}
44-
&& apk add --no-cache supervisor=4.2.5-r4 \
44+
&& apk add --no-cache supervisor=4.2.5-r5 \
4545
{% endif %}
4646
&& \
4747
curl -sSLf \

‎src/group_vars/base.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,7 @@ ext_pecl_enabled:
106106
- decimal
107107
- amqp
108108
- yaml
109+
- grpc
110+
- protobuf
109111

110112
...

‎src/inventory.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,108 +11,108 @@ all:
1111
php_version: 7.4
1212
php_type: cli
1313
os_name: alpine
14-
os_version: 3.19
14+
os_version: 3.20
1515
7.4-fpm-alpine:
1616
ansible_connection: local
1717
level: base
1818
php_version: 7.4
1919
php_type: fpm
2020
os_name: alpine
21-
os_version: 3.19
21+
os_version: 3.20
2222
7.4-supervisord-alpine:
2323
ansible_connection: local
2424
level: base
2525
php_version: 7.4
2626
php_type: supervisord
2727
os_name: alpine
28-
os_version: 3.19
28+
os_version: 3.20
2929
# PHP 8.0
3030
8.0-cli-alpine:
3131
ansible_connection: local
3232
level: base
3333
php_version: 8.0
3434
php_type: cli
3535
os_name: alpine
36-
os_version: 3.19
36+
os_version: 3.20
3737
8.0-fpm-alpine:
3838
ansible_connection: local
3939
level: base
4040
php_version: 8.0
4141
php_type: fpm
4242
os_name: alpine
43-
os_version: 3.19
43+
os_version: 3.20
4444
8.0-supervisord-alpine:
4545
ansible_connection: local
4646
level: base
4747
php_version: 8.0
4848
php_type: supervisord
4949
os_name: alpine
50-
os_version: 3.19
50+
os_version: 3.20
5151
# PHP 8.1
5252
8.1-cli-alpine:
5353
ansible_connection: local
5454
level: base
5555
php_version: 8.1
5656
php_type: cli
5757
os_name: alpine
58-
os_version: 3.19
58+
os_version: 3.20
5959
8.1-fpm-alpine:
6060
ansible_connection: local
6161
level: base
6262
php_version: 8.1
6363
php_type: fpm
6464
os_name: alpine
65-
os_version: 3.19
65+
os_version: 3.20
6666
8.1-supervisord-alpine:
6767
ansible_connection: local
6868
level: base
6969
php_version: 8.1
7070
php_type: supervisord
7171
os_name: alpine
72-
os_version: 3.19
72+
os_version: 3.20
7373
# PHP 8.2
7474
8.2-cli-alpine:
7575
ansible_connection: local
7676
level: base
7777
php_version: 8.2
7878
php_type: cli
7979
os_name: alpine
80-
os_version: 3.19
80+
os_version: 3.20
8181
8.2-fpm-alpine:
8282
ansible_connection: local
8383
level: base
8484
php_version: 8.2
8585
php_type: fpm
8686
os_name: alpine
87-
os_version: 3.19
87+
os_version: 3.20
8888
8.2-supervisord-alpine:
8989
ansible_connection: local
9090
level: base
9191
php_version: 8.2
9292
php_type: supervisord
9393
os_name: alpine
94-
os_version: 3.19
94+
os_version: 3.20
9595
# PHP 8.3
9696
8.3-cli-alpine:
9797
ansible_connection: local
9898
level: base
9999
php_version: 8.3
100100
php_type: cli
101101
os_name: alpine
102-
os_version: 3.19
102+
os_version: 3.20
103103
8.3-fpm-alpine:
104104
ansible_connection: local
105105
level: base
106106
php_version: 8.3
107107
php_type: fpm
108108
os_name: alpine
109-
os_version: 3.19
109+
os_version: 3.20
110110
8.3-supervisord-alpine:
111111
ansible_connection: local
112112
level: base
113113
php_version: 8.3
114114
php_type: supervisord
115115
os_name: alpine
116-
os_version: 3.19
116+
os_version: 3.20
117117

118118
...

0 commit comments

Comments
 (0)