Skip to content

Commit 4690840

Browse files
committed
Initial clean of the template addon clone
1 parent ed3b16a commit 4690840

6 files changed

+19
-119
lines changed

README.md

+6-89
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,10 @@
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+
[![tests](https://github.com/hanoii/ddev-pimp-my-shell/actions/workflows/tests.yml/badge.svg)](https://github.com/hanoii/ddev-pimp-my-shell/actions/workflows/tests.yml) ![project is maintained](https://img.shields.io/maintenance/yes/2024.svg)
22

3-
# ddev-addon-template <!-- omit in toc -->
3+
# ddev-pimp-my-shell <!-- omit in toc -->
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+
<!-- toc -->
6+
<!-- stoptoc -->
97

10-
## What is ddev-addon-template?
8+
## What is ddev-pimp-my-shell?
119

12-
This repository is a template for providing [DDEV](https://ddev.readthedocs.io) add-ons and services.
13-
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`.
15-
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
67-
```
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)
73-
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.
75-
76-
7. Pick one of the jobs in progress in the sidebar.
77-
78-
8. Wait until the current task list reaches the `tmate debugging session` section and the output shows something like:
79-
80-
```
81-
106 SSH: ssh [email protected]
82-
107 or: ssh -i <path-to-private-SSH-key> [email protected]
83-
108 SSH: ssh [email protected]
84-
109 or: ssh -i <path-to-private-SSH-key> [email protected]
85-
```
86-
87-
9. Copy and execute the first option `ssh [email protected]` 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)**
10+
**Contributed and maintained by [@hanoii](https://github.com/hanoii)**

docker-compose.addon-template.yaml

-17
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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 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
22

3-
name: addon-template
3+
name: pimp-my-shell
44

55
# pre_install_actions - list of actions to run before installing the addon.
66
# Examples would be removing an extraneous docker volume,
@@ -58,7 +58,7 @@ pre_install_actions:
5858
# if it hasn't been modified by the user.
5959
# DDEV environment variables can be interpolated into these filenames
6060
project_files:
61-
- docker-compose.addon-template.yaml
61+
- docker-compose.pimp-my-shell.yaml
6262
# - extra_files/
6363
# - somefile.sh
6464

@@ -76,7 +76,7 @@ dependencies:
7676
post_install_actions:
7777
# - chmod +x ~/.ddev/commands/web/somecommand
7878
# - touch somefile.${GOOS}.${DDEV_WEBSERVER}
79-
# - perl -pi -e 's/oldstring/newstring/g' docker-compose.addon-template.yaml
79+
# - perl -pi -e 's/oldstring/newstring/g' docker-compose.pimp-my-shell.yaml
8080

8181
# Shell actions that can be done during removal of the add-on
8282
removal_actions:

tests/test.bats

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
setup() {
22
set -eu -o pipefail
33
export DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )/.."
4-
export TESTDIR=~/tmp/test-addon-template
4+
export TESTDIR=~/tmp/test-pimp-my-shell
55
mkdir -p $TESTDIR
6-
export PROJNAME=test-addon-template
6+
export PROJNAME=test-pimp-my-shell
77
export DDEV_NON_INTERACTIVE=true
88
ddev delete -Oy ${PROJNAME} >/dev/null 2>&1 || true
99
cd "${TESTDIR}"
@@ -33,12 +33,12 @@ teardown() {
3333
health_checks
3434
}
3535

36-
@test "install from release" {
37-
set -eu -o pipefail
38-
cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
39-
echo "# ddev get ddev/ddev-addon-template with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
40-
ddev get ddev/ddev-addon-template
41-
ddev restart >/dev/null
42-
health_checks
43-
}
36+
#@test "install from release" {
37+
# set -eu -o pipefail
38+
# cd ${TESTDIR} || ( printf "unable to cd to ${TESTDIR}\n" && exit 1 )
39+
# echo "# ddev get ddev/ddev-pimp-my-shell with project ${PROJNAME} in ${TESTDIR} ($(pwd))" >&3
40+
# ddev get ddev/ddev-pimp-my-shell
41+
# ddev restart >/dev/null
42+
# health_checks
43+
#}
4444

0 commit comments

Comments
 (0)