Skip to content

feat: add protobuf and grpc #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2024
Merged

feat: add protobuf and grpc #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77d6fee
feat: add protobuf and grpc
lotyp Aug 25, 2024
7f5127f
deps: update versions
lotyp Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
export DOCKER_BUILDKIT ?= 1
export COMPOSE_DOCKER_CLI_BUILD ?= 1

# Docker binary to use, when executing docker tasks
DOCKER ?= docker

IMAGE_NAMESPACE ?= wayofdev/php-base
IMAGE_TEMPLATE ?= 8.3-fpm-alpine
IMAGE_TAG ?= $(IMAGE_NAMESPACE):$(IMAGE_TEMPLATE)-latest
Expand All @@ -13,7 +16,26 @@ CACHE_FROM ?= $(IMAGE_TAG)
OS ?= $(shell uname)
CURRENT_DIR ?= $(dir $(abspath $(lastword $(MAKEFILE_LIST))))


# Yamllint docker image
YAML_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \
-v $(PWD):/data \
cytopia/yamllint:latest \
-c ./.github/.yamllint.yaml \
-f colored .

ACTION_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \
-v $(shell pwd):/repo \
--workdir /repo \
rhysd/actionlint:latest \
-color

MARKDOWN_LINT_RUNNER ?= $(DOCKER) run --rm $$(tty -s && echo "-it" || echo) \
-v $(shell pwd):/app \
--workdir /app \
davidanson/markdownlint-cli2-rules:latest \
--config ".github/.markdownlint.json"

#
# Self documenting Makefile code
# ------------------------------------------------------------------------------------
ifneq ($(TERM),)
Expand Down
24 changes: 13 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<br>

<div align="center">
<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">
<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">
</div>

<br>

<br>
<p align="center">
<br>
<a href="https://wayof.dev" target="_blank">
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/wayofdev/.github/master/assets/logo.gh-dark-mode-only.png">
<img width="400" src="https://raw.githubusercontent.com/wayofdev/.github/master/assets/logo.gh-light-mode-only.png" alt="WayOfDev Logo">
</picture>
</a>
<br>
</p>

<div align="center">
<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>
Expand Down Expand Up @@ -41,7 +41,9 @@ Enabled extensions by default:
| [memcached](https://pecl.php.net/package/memcached) | Functions for interfacing with Memcached | pecl |
| [decimal](https://pecl.php.net/package/decimal) | Arbitrary precision floating-point decimal | pecl |
| [amqp](https://pecl.php.net/package/amqp) | Advanced Message Queuing Protocol (AMQP) library | pecl |
| [yaml](https://pecl.php.net/package/yaml) | YAML (YAML Ain't Markup Language) library | pecl |
| [yaml](https://pecl.php.net/package/yaml) | YAML library | pecl |
| [grpc](https://pecl.php.net/package/grpc) | gRPC library | pecl |
| [protobuf](https://pecl.php.net/package/protobuf) | Protocol Buffers library | pecl |

<br>

Expand Down
2 changes: 1 addition & 1 deletion src/Dockerfiles/base/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ COPY --chown=www-data ./configs/php.ini /usr/local/etc/php/conf.d/php.ini
RUN set -eux; \
apk -U upgrade -a \
{% if 'supervisord' == php_type %}
&& apk add --no-cache supervisor=4.2.5-r4 \
&& apk add --no-cache supervisor=4.2.5-r5 \
{% endif %}
&& \
curl -sSLf \
Expand Down
2 changes: 2 additions & 0 deletions src/group_vars/base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,7 @@ ext_pecl_enabled:
- decimal
- amqp
- yaml
- grpc
- protobuf

...
30 changes: 15 additions & 15 deletions src/inventory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,108 +11,108 @@ all:
php_version: 7.4
php_type: cli
os_name: alpine
os_version: 3.19
os_version: 3.20
7.4-fpm-alpine:
ansible_connection: local
level: base
php_version: 7.4
php_type: fpm
os_name: alpine
os_version: 3.19
os_version: 3.20
7.4-supervisord-alpine:
ansible_connection: local
level: base
php_version: 7.4
php_type: supervisord
os_name: alpine
os_version: 3.19
os_version: 3.20
# PHP 8.0
8.0-cli-alpine:
ansible_connection: local
level: base
php_version: 8.0
php_type: cli
os_name: alpine
os_version: 3.19
os_version: 3.20
8.0-fpm-alpine:
ansible_connection: local
level: base
php_version: 8.0
php_type: fpm
os_name: alpine
os_version: 3.19
os_version: 3.20
8.0-supervisord-alpine:
ansible_connection: local
level: base
php_version: 8.0
php_type: supervisord
os_name: alpine
os_version: 3.19
os_version: 3.20
# PHP 8.1
8.1-cli-alpine:
ansible_connection: local
level: base
php_version: 8.1
php_type: cli
os_name: alpine
os_version: 3.19
os_version: 3.20
8.1-fpm-alpine:
ansible_connection: local
level: base
php_version: 8.1
php_type: fpm
os_name: alpine
os_version: 3.19
os_version: 3.20
8.1-supervisord-alpine:
ansible_connection: local
level: base
php_version: 8.1
php_type: supervisord
os_name: alpine
os_version: 3.19
os_version: 3.20
# PHP 8.2
8.2-cli-alpine:
ansible_connection: local
level: base
php_version: 8.2
php_type: cli
os_name: alpine
os_version: 3.19
os_version: 3.20
8.2-fpm-alpine:
ansible_connection: local
level: base
php_version: 8.2
php_type: fpm
os_name: alpine
os_version: 3.19
os_version: 3.20
8.2-supervisord-alpine:
ansible_connection: local
level: base
php_version: 8.2
php_type: supervisord
os_name: alpine
os_version: 3.19
os_version: 3.20
# PHP 8.3
8.3-cli-alpine:
ansible_connection: local
level: base
php_version: 8.3
php_type: cli
os_name: alpine
os_version: 3.19
os_version: 3.20
8.3-fpm-alpine:
ansible_connection: local
level: base
php_version: 8.3
php_type: fpm
os_name: alpine
os_version: 3.19
os_version: 3.20
8.3-supervisord-alpine:
ansible_connection: local
level: base
php_version: 8.3
php_type: supervisord
os_name: alpine
os_version: 3.19
os_version: 3.20

...