Skip to content

Commit 39d2db0

Browse files
committed
initial commit
1 parent 5e2a9c0 commit 39d2db0

File tree

5 files changed

+51
-60
lines changed

5 files changed

+51
-60
lines changed

README.md

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,32 @@
1-
[![tests](https://github.com/drud/ddev-addon-template/actions/workflows/tests.yml/badge.svg)](https://github.com/drud/ddev-addon-template/actions/workflows/tests.yml) ![project is maintained](https://img.shields.io/maintenance/yes/2022.svg)
1+
# tyler36/ddev-laravel-queue <!-- omit in toc -->
22

3-
## What is ddev-addon-template?
3+
[![tests](https://github.com/tyler36/ddev-laravel-queue/actions/workflows/tests.yml/badge.svg)](https://github.com/tyler36/ddev-laravel-queue/actions/workflows/tests.yml) ![project is maintained](https://img.shields.io/maintenance/yes/2022.svg)
44

5-
This repository is a template for providing [DDEV](https://ddev.readthedocs.io) addons and services.
5+
- [Introduction](#introduction)
6+
- [Getting Started](#getting-started)
7+
- [What does this add-on do and add?](#what-does-this-add-on-do-and-add)
68

7-
In ddev v1.19+ addons can be installed from the command line using the `ddev get` command, for example, `ddev get drud/ddev-addon-template` or `ddev get drud/ddev-drupal9-solr`.
9+
## Introduction
810

9-
A repository like this one is the way to get started. You can create a new repo from this one by clicking the template button in the top right corner of the page.
11+
This add-on allows you to start a Laravel queue worker through the DDEV web service. See [offical Queues documentation](https://laravel.com/docs/9.x/queues) for more details.
1012

11-
![template button](images/template-button.png)
13+
## Getting Started
1214

13-
## Components of the repository
15+
This add-on requires DDEV v1.19.3 or higher.
1416

15-
* The fundamental contents of the add-on service or other component. For example, in this template there is a [docker-compose.addon-template.yaml](docker-compose.addon-template.yaml) file.
16-
* An [install.yaml](install.yaml) file that describes how to install the service or other component.
17-
* A test suite in [test.bats](tests/test.bats) that makes sure the service continues to work as expected.
18-
* [Github actions setup](.github/workflows/tests.yml) so that the tests run automatically when you push to the repository.
17+
- Install the DDEV laravel worker add-on:
1918

20-
## Getting started
19+
```shell
20+
ddev get tyler36/ddev-laravel-queue
21+
ddev restart
22+
```
2123

22-
1. Choose a good descriptive name for your add-on. It should probably start with "ddev-" and include the basic service or functionality. If it's particular to a specific CMS, perhaps `ddev-<CMS>-servicename`.
23-
2. Create the new template repository by using the template button.
24-
3. Globally replace "addon-template" with the name of your add-on.
25-
4. Add the files that need to be added to a ddev project to the repository. For example, you might remove `docker-composeaddon-template.yaml` with the `docker-compose.*.yaml` for your recipe.
26-
5. Update the install.yaml to give the necessary instructions for installing the add-on.
27-
* The fundamental line is the `project_files` directive, a list of files to be copied from this repo into the project `.ddev` directory.
28-
* You can optionally add files to the `global_files` directive as well, which will cause files to be placed in the global `.ddev` directory, `~/.ddev`.
29-
* Finally, `pre_install_commands` and `post_install_commands` are supported. These can use the host-side environment variables documented [in ddev docs](https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/#environment-variables-provided).
30-
6. Update `tests/test.bats` to provide a reasonable test for the repository. You can run it manually with `bats tests` and it will be run on push and nightly as well. Please make sure to attend to test failures when they happen. Others will be depending on you. `bats` is a simple testing framework that just uses `bash`. You can install it with `brew install bats-core` or [see other techniques](https://bats-core.readthedocs.io/en/stable/installation.html). See [bats tutorial](https://bats-core.readthedocs.io/en/stable/).
31-
7. When everything is working, including the tests, you can push the repository to GitHub.
32-
8. Create a release on GitHub.
33-
9. Test manually with `ddev get <owner/repo>`.
34-
10. Update the README.md to describe the add-on, how to use it, and how to contribute. If there are any manual actions that have to be taken, please explain them. If it requires special configuration of the using project, please explain how to do those. Examples in [drud/ddev-drupal9-solr](https://github.com/drud/ddev-drupal9-solr), [drud/ddev-memcached](github.com/drud/ddev-memcached), and [drud/ddev-beanstalkd](https://github.com/drud/ddev-beanstalkd).
35-
11. Add a good short description to your repo, and add the label "ddev-get". It will immediately be added to the list provided by `ddev get --list --all`.
36-
12. When it has matured you will hopefully want to have it become an "official" maintained add-on. Open an issue in the [ddev queue](https://github.com/drud/ddev/issues) for that.
24+
## What does this add-on do and add?
3725

38-
**Contributed and maintained by [@CONTRIBUTOR](https://github.com/CONTRIBUTOR) based on the original [ddev-contrib recipe](https://github.com/drud/ddev-contrib/tree/master/docker-compose-services/RECIPE) by [@CONTRIBUTOR](https://github.com/CONTRIBUTOR)**
39-
40-
**Originally Contributed by [somebody](https://github.com/somebody) in https://github.com/drud/ddev-contrib/...)
26+
1. Checks to make sure the DDEV version is adequate.
27+
2. Adds `.ddev/web-build/laravel-worker.conf`, which configures the queue worker.
28+
3. Adds `.ddev/web-build/Dockerfile.ddev-laravel-worker`, which adds the worker to supervisor.
4129

30+
See [Configuring Supervisor](https://laravel.com/docs/master/queues#configuring-supervisor) for the latest recommended settings.
4231

32+
**Contributed and maintained by [tyler36](https://github.com/tyler36)**

docker-compose.addon-template.yaml

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

tests/test.bats

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
setup() {
22
set -eu -o pipefail
3+
34
export DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )/.."
4-
export TESTDIR=~/tmp/testelasticsearch
5+
export TESTDIR=~/tmp/ddev-laravel-worker
56
mkdir -p $TESTDIR
6-
export PROJNAME=test-addon-template
7+
export PROJNAME=ddev-laravel-worker
78
export DDEV_NON_INTERACTIVE=true
89
ddev delete -Oy ${PROJNAME} || true
910
cd "${TESTDIR}"
1011
ddev config --project-name=${PROJNAME}
11-
ddev start
12+
ddev start -y
13+
echo "# ddev started at $(date)" >&3
1214
}
1315

1416
teardown() {
@@ -24,16 +26,20 @@ teardown() {
2426
echo "# ddev get ${DIR} with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
2527
ddev get ${DIR}
2628
ddev restart
27-
# Do something here to verify functioning extra service
28-
# For extra credit, use a real CMS with actual config.
29-
# ddev exec "curl -s elasticsearch:9200" | grep "${PROJNAME}-elasticsearch"
30-
}
3129

32-
@test "install from release" {
33-
set -eu -o pipefail
34-
cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
35-
echo "# ddev get drud/ddev-addon-template with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
36-
ddev get drud/ddev-addon-template
37-
ddev restart
38-
# ddev exec "curl -s elasticsearch:9200" | grep "${PROJNAME}-elasticsearch"
30+
sleep 61
31+
# Make sure cron process is running
32+
ddev exec 'sudo killall -0 cron'
3933
}
34+
35+
# @test "install from release" {
36+
# set -eu -o pipefail
37+
# cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
38+
# echo "# ddev get tyler36/ddev-laravel-worker with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
39+
# ddev get tyler36/ddev-laravel-worker
40+
# ddev restart
41+
42+
# sleep 61
43+
# # Make sure cron process is running
44+
# ddev exec 'sudo killall -0 cron'
45+
# }
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#ddev-generated
2+
ADD laravel-worker.conf /etc/supervisor/conf.d/

web-build/laravel-worker.conf

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[program:laravel-worker]
2+
process_name=%(program_name)s_%(process_num)s
3+
command=/usr/bin/php /var/www/html/artisan queue:work --sleep=3 --tries=3
4+
autostart=true
5+
autorestart=true
6+
numprocs=8
7+
redirect_stderr=true
8+
stdout_logfile=/proc/self/fd/2
9+
stopwaitsecs=3600

0 commit comments

Comments
 (0)