Skip to content

Commit 8d05b96

Browse files
Setup Craft supervisor daemon
1 parent 931551c commit 8d05b96

File tree

7 files changed

+41
-188
lines changed

7 files changed

+41
-188
lines changed

README.md

Lines changed: 25 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,37 @@
1-
[![tests](https://github.com/ddev/ddev-addon-template/actions/workflows/tests.yml/badge.svg)](https://github.com/ddev/ddev-addon-template/actions/workflows/tests.yml) ![project is maintained](https://img.shields.io/maintenance/yes/2024.svg)
1+
# fostercommerce/ddev-craft-queue <!-- omit in toc -->
22

3-
# ddev-addon-template <!-- omit in toc -->
3+
[![tests](https://github.com/fostercommerce/ddev-craft-queue/actions/workflows/tests.yml/badge.svg)](https://github.com/fostercommerce/ddev-craft-queue/actions/workflows/tests.yml) ![project is maintained](https://img.shields.io/maintenance/yes/2024.svg)
44

5-
* [What is ddev-addon-template?](#what-is-ddev-addon-template)
6-
* [Components of the repository](#components-of-the-repository)
7-
* [Getting started](#getting-started)
8-
* [How to debug in Github Actions](#how-to-debug-tests-github-actions)
5+
- [Introduction](#introduction)
6+
- [Installation Started](#installation)
7+
- [Configuration](#configuration)
98

10-
## What is ddev-addon-template?
9+
## Introduction
1110

12-
This repository is a template for providing [DDEV](https://ddev.readthedocs.io) add-ons and services.
11+
This add-on allows you to start a Craft queue worker in a Craft's DDEV web container.
1312

14-
In DDEV addons can be installed from the command line using the `ddev get` command, for example, `ddev get ddev/ddev-redis` or `ddev get ddev/ddev-solr`.
13+
## Installation
1514

16-
This repository is a quick 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.
17-
18-
![template button](images/template-button.png)
19-
20-
## Components of the repository
21-
22-
* 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.
23-
* An [install.yaml](install.yaml) file that describes how to install the service or other component.
24-
* A test suite in [test.bats](tests/test.bats) that makes sure the service continues to work as expected.
25-
* [Github actions setup](.github/workflows/tests.yml) so that the tests run automatically when you push to the repository.
26-
27-
## Getting started
28-
29-
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`.
30-
2. Create the new template repository by using the template button.
31-
3. Globally replace "addon-template" with the name of your add-on.
32-
4. Add the files that need to be added to a DDEV project to the repository. For example, you might replace `docker-compose.addon-template.yaml` with the `docker-compose.*.yaml` for your recipe.
33-
5. Update the `install.yaml` to give the necessary instructions for installing the add-on:
34-
35-
* The fundamental line is the `project_files` directive, a list of files to be copied from this repo into the project `.ddev` directory.
36-
* 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`.
37-
* 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/latest/users/extend/custom-commands/#environment-variables-provided).
38-
39-
6. Update `tests/test.bats` to provide a reasonable test for your repository. Tests are triggered either by manually executing `bats ./tests/test.bats`, automatically on every push to the repository, or periodically each night. 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. To run a Bats test locally, you have to [install bats-core](https://bats-core.readthedocs.io/en/stable/installation.html) first. Then you download your add-on, and finally run `bats ./tests/test.bats` within the root of the uncompressed directory. To learn more about Bats see the [documentation](https://bats-core.readthedocs.io/en/stable/).
40-
7. When everything is working, including the tests, you can push the repository to GitHub.
41-
8. Create a [release](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository) on GitHub.
42-
9. Test manually with `ddev get <owner/repo>`.
43-
10. You can test PRs with `ddev get https://github.com/<user>/<repo>/tarball/<branch>`
44-
11. 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 [ddev/ddev-solr](https://github.com/ddev/ddev-solr), [ddev/ddev-memcached](https://github.com/ddev/ddev-memcached), and (advanced) [ddev-platformsh](https://github.com/ddev/ddev-platformsh).
45-
12. Update the `README.md` header in Title Case format, for example, use `# DDEV Redis`, not `# ddev-redis`.
46-
13. Add a good short description to your repo, and add the [topic](https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/classifying-your-repository-with-topics) "ddev-get". It will immediately be added to the list provided by `ddev get --list --all`.
47-
14. 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/ddev/ddev/issues) for that.
48-
49-
Add-ons were covered in [DDEV Add-ons: Creating, maintaining, testing](https://www.dropbox.com/scl/fi/bnvlv7zswxwm8ix1s5u4t/2023-11-07_DDEV_Add-ons.mp4?rlkey=5cma8s11pscxq0skawsoqrscp&dl=0) (part of the [DDEV Contributor Live Training](https://ddev.com/blog/contributor-training)).
50-
51-
Note that more advanced techniques are discussed in [DDEV docs](https://ddev.readthedocs.io/en/latest/users/extend/additional-services/#additional-service-configurations-and-add-ons-for-ddev).
52-
53-
## How to debug tests (Github Actions)
54-
55-
1. You need an SSH-key registered with GitHub. You either pick the key you have already used with `github.com` or you create a dedicated new one with `ssh-keygen -t ed25519 -a 64 -f tmate_ed25519 -C "$(date +'%d-%m-%Y')"` and add it at `https://github.com/settings/keys`.
56-
57-
2. Add the following snippet to `~/.ssh/config`:
58-
59-
```
60-
Host *.tmate.io
61-
User git
62-
AddKeysToAgent yes
63-
UseKeychain yes
64-
PreferredAuthentications publickey
65-
IdentitiesOnly yes
66-
IdentityFile ~/.ssh/tmate_ed25519
15+
```shell
16+
ddev get fostercommerce/ddev-craft-queue
17+
ddev restart
6718
```
68-
3. Go to `https://github.com/<user>/<repo>/actions/workflows/tests.yml`.
69-
70-
4. Click the `Run workflow` button and you will have the option to select the branch to run the workflow from and activate `tmate` by checking the `Debug with tmate` checkbox for this run.
71-
72-
![tmate](images/gh-tmate.jpg)
7319

74-
5. After the `workflow_dispatch` event was triggered, click the `All workflows` link in the sidebar and then click the `tests` action in progress workflow.
20+
## Configuration
7521

76-
7. Pick one of the jobs in progress in the sidebar.
22+
This plugin adds the `web-build/craft-worker.conf` file. To configure your queue workers, remove the `#ddev-generated` line, and update the file.
7723

78-
8. Wait until the current task list reaches the `tmate debugging session` section and the output shows something like:
24+
For example, to run multiple queue workers, update the file to
7925

8026
```
81-
106 SSH: ssh PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io
82-
107 or: ssh -i <path-to-private-SSH-key> PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io
83-
108 SSH: ssh PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io
84-
109 or: ssh -i <path-to-private-SSH-key> PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io
85-
```
86-
87-
9. Copy and execute the first option `ssh PRbaS7SLVxbXImhjUqydQBgDL@nyc1.tmate.io` in the terminal and continue by pressing either <kbd>q</kbd> or <kbd>Ctrl</kbd> + <kbd>c</kbd>.
88-
89-
10. Start the Bats test with `bats ./tests/test.bats`.
90-
91-
For a more detailed documentation about `tmate` see [Debug your GitHub Actions by using tmate](https://mxschmitt.github.io/action-tmate/).
92-
93-
**Contributed and maintained by [@CONTRIBUTOR](https://github.com/CONTRIBUTOR)**
27+
[program:craft-queue]
28+
process_name=%(program_name)s_%(process_num)s
29+
command=/usr/bin/php /var/www/html/craft queue/listen
30+
autostart=true
31+
autorestart=true
32+
numprocs=4
33+
stdout_logfile=/var/tmp/logpipe
34+
stdout_logfile_maxbytes=0
35+
redirect_stderr=true
36+
stopwaitsecs=3600
37+
```

docker-compose.addon-template.yaml

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

images/gh-tmate.jpg

-53.9 KB
Binary file not shown.

images/template-button.png

-20 KB
Binary file not shown.

install.yaml

Lines changed: 3 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,4 @@
1-
# Details about the install.yaml file are at https://ddev.readthedocs.io/en/latest/users/extend/additional-services/#sections-and-features-of-ddev-get-add-on-installyaml
2-
3-
name: addon-template
4-
5-
# pre_install_actions - list of actions to run before installing the addon.
6-
# Examples would be removing an extraneous docker volume,
7-
# or doing a sanity check for requirements.
8-
# DDEV environment variables can be interpolated into these actions
9-
pre_install_actions:
10-
# Actions with #ddev-nodisplay will not show the execution of the action, but may show their output
11-
# - |
12-
# #ddev-nodisplay
13-
#ddev-description:Check architecture type for incompatible arm64 type
14-
# if [ "$(arch)" = "arm64" -o "$(arch)" = "aarch64" ]; then
15-
# echo "This package does not work on arm64 machines";
16-
# exit 1;
17-
#fi
18-
19-
# - "docker volume rm ddev-${DDEV_PROJECT}_solr 2>/dev/null || true"
20-
#- |
21-
# # Using #ddev-nodisplay tells ddev to be quiet about this action and not show it or its output.
22-
# #ddev-nodisplay
23-
# #ddev-description:Remove solr volume
24-
# if ! ( ddev debug capabilities 2>/dev/null | grep multiple-dockerfiles >/dev/null 2>&1 ) ; then
25-
# echo "This add-on requires DDEV v1.19.4 or higher, please upgrade." && exit 2
26-
# fi
27-
#- 'echo "what is your platform.sh token" && read x'
28-
29-
# This item shows templating using DDEV environment variables.
30-
# -
31-
# #ddev-description:Touch a file to create it
32-
# touch somefile.${DDEV_PROJECT_TYPE}.${DDEV_DOCROOT}.txt
33-
#
34-
35-
# This item shows complex go templating possibilities based on yaml_read_files
36-
#- |
37-
#- #ddev-description:Create a config.platformsh.yaml
38-
# cat <<EOF >.ddev/config.platformsh.yaml
39-
# php_version: {{ trimPrefix "php:" .platformapp.type }}
40-
# database:
41-
# type: {{ regexReplaceAll ":.*$" .services.db.type "" }}
42-
# version: {{ regexReplaceAll "^.*:" .services.db.type "" }}
43-
#
44-
# docroot: {{ dig "web" "locations" "/" "root" "notfound" .platformapp }}
45-
# {{ if eq .platformapp.build.flavor "composer" }}
46-
# hooks:
47-
# post-start:
48-
# - composer: install
49-
# {{ if .platformapp.hooks.deploy }}
50-
# - exec: "{{ trimAll "\n" .platformapp.hooks.deploy | splitList "\n" | join ` && ` }}"
51-
# {{ end }}
52-
# {{ end }}
53-
#
54-
# EOF
55-
56-
# list of files and directories listed that are copied into project .ddev directory
57-
# Each file should contain #ddev-generated so it can be replaced by a later `ddev get`
58-
# if it hasn't been modified by the user.
59-
# DDEV environment variables can be interpolated into these filenames
1+
name: ddev-craft-queue
602
project_files:
61-
- docker-compose.addon-template.yaml
62-
# - extra_files/
63-
# - somefile.sh
64-
65-
# List of files and directories that are copied into the global .ddev directory
66-
# DDEV environment variables can be interpolated into these filenames
67-
global_files:
68-
# - commands
69-
# - homeadditions
70-
71-
# List of add-on names that this add-on depends on
72-
dependencies:
73-
# - redis
74-
75-
# DDEV environment variables can be interpolated into these actions
76-
post_install_actions:
77-
# - chmod +x ~/.ddev/commands/web/somecommand
78-
# - touch somefile.${GOOS}.${DDEV_WEBSERVER}
79-
# - perl -pi -e 's/oldstring/newstring/g' docker-compose.addon-template.yaml
80-
81-
# Shell actions that can be done during removal of the add-on
82-
removal_actions:
83-
# - rm ~/.ddev/commands/web/somecommand
84-
85-
# Advanced usage - yaml files can be read in and then used as go template actions
86-
# in pre_install_actions and post_install_actions
87-
# See example in
88-
# https://github.com/rfay/ddev/blob/20220606_yaml_read_experiment/cmd/ddev/cmd/testdata/TestCmdGetComplex/recipe/install.yaml
89-
yaml_read_files:
90-
# someyaml: someyaml.yaml
91-
# otheryaml: someotheryaml.yaml
3+
- web-build/Dockerfile.ddev-craft-worker
4+
- web-build/craft-worker.conf
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#ddev-generated
2+
ADD craft-worker.conf /etc/supervisor/conf.d

web-build/craft-worker.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#ddev-generated
2+
[program:craft-queue]
3+
process_name=%(program_name)s_%(process_num)s
4+
command=/usr/bin/php /var/www/html/craft queue/listen
5+
autostart=true
6+
autorestart=true
7+
numprocs=1
8+
stdout_logfile=/var/tmp/logpipe
9+
stdout_logfile_maxbytes=0
10+
redirect_stderr=true
11+
stopwaitsecs=3600

0 commit comments

Comments
 (0)