Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.

Commit 7465766

Browse files
committed
update templates
1 parent 54c817d commit 7465766

14 files changed

+633
-122
lines changed

.editorconfig

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This file is globally distributed to all container image projects from
2+
# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
3+
4+
# top-most EditorConfig file
5+
root = true
6+
7+
# Unix-style newlines with a newline ending every file
8+
[*]
9+
end_of_line = lf
10+
insert_final_newline = true
11+
# trim_trailing_whitespace may cause unintended issues and should not be globally set true
12+
trim_trailing_whitespace = false
13+
14+
[{Dockerfile*,**.yml}]
15+
indent_style = space
16+
indent_size = 2
17+
18+
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
19+
indent_style = space
20+
indent_size = 4

.github/CONTRIBUTING.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
66
* Read, and fill the Pull Request template
7-
* If this is a fix for a typo in code or documentation in the README please file an issue
7+
* If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
88
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
99
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
1010

@@ -24,7 +24,7 @@
2424
## Readme
2525

2626
If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
27-
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-gmail-order-bot/edit/master/readme-vars.yml).
27+
Instead edit the [readme-vars.yml](https://github.com/lsiodev/docker-gmail-order-bot/edit/master/readme-vars.yml).
2828

2929
These variables are used in a template for our [Jenkins Builder](https://github.com/lsiodev/docker-jenkins-builder) as part of an ansible play.
3030
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-gmail-order-bot)
@@ -87,7 +87,7 @@ opt_param_volumes:
8787
8888
### Testing template changes
8989
90-
After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/lsiodev/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR.
90+
After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/lsiodev/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/lsiodev/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR.
9191

9292
## Dockerfiles
9393

@@ -96,7 +96,7 @@ If you are proposing additional packages to be added, ensure that you added the
9696

9797
### Testing your changes
9898

99-
```
99+
```bash
100100
git clone https://github.com/lsiodev/docker-gmail-order-bot.git
101101
cd docker-gmail-order-bot
102102
docker build \
@@ -106,15 +106,16 @@ docker build \
106106
```
107107

108108
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
109-
```
109+
110+
```bash
110111
docker run --rm --privileged multiarch/qemu-user-static:register --reset
111112
```
112113

113114
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
114115

115-
## Update the chagelog
116+
## Update the changelog
116117

117-
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-gmail-order-bot/tree/master/root), add an entry to the changelog
118+
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/lsiodev/docker-gmail-order-bot/tree/master/root), add an entry to the changelog
118119

119120
```yml
120121
changelogs:

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Discord chat support
4+
url: https://discord.gg/YWrKVTn
5+
about: Realtime support / chat with the community and the team.
6+
7+
- name: Discourse discussion forum
8+
url: https://discourse.linuxserver.io
9+
about: Post on our community forum.
10+
11+
- name: Documentation
12+
url: https://docs.linuxserver.io/images/docker-gmail-order-bot
13+
about: Documentation - information about all of our containers.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
[linuxserverurl]: https://linuxserver.io
7+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
8+
9+
<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
10+
11+
<!--- Provide a general summary of the bug in the Title above -->
12+
13+
------------------------------
14+
15+
## Expected Behavior
16+
<!--- Tell us what should happen -->
17+
18+
## Current Behavior
19+
<!--- Tell us what happens instead of the expected behavior -->
20+
21+
## Steps to Reproduce
22+
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
23+
<!--- reproduce this bug. Include code to reproduce, if relevant -->
24+
1.
25+
2.
26+
3.
27+
4.
28+
29+
## Environment
30+
**OS:**
31+
**CPU architecture:** x86_64/arm32/arm64
32+
**How docker service was installed:**
33+
<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
34+
<!--- Providing context helps us come up with a solution that is most useful in the real world -->
35+
36+
## Command used to create docker container (run/create/compose/screenshot)
37+
<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
38+
39+
## Docker logs
40+
<!--- Provide a full docker log, output of "docker logs gmail-order-bot" -->
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
[linuxserverurl]: https://linuxserver.io
7+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
8+
9+
<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
10+
11+
<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
12+
<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
13+
14+
<!--- Provide a general summary of the request in the Title above -->
15+
16+
------------------------------
17+
18+
## Desired Behavior
19+
<!--- Tell us what should happen -->
20+
21+
## Current Behavior
22+
<!--- Tell us what happens instead of the expected behavior -->
23+
24+
## Alternatives Considered
25+
<!--- Tell us what other options you have tried or considered -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<!--- Before submitting a pull request please check the following -->
88

9-
<!--- If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR -->
9+
<!--- If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR -->
1010
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
1111
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
1212
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
@@ -21,7 +21,7 @@
2121

2222
------------------------------
2323

24-
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-gmail-order-bot/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
24+
- [ ] I have read the [contributing](https://github.com/lsiodev/docker-gmail-order-bot/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
2525

2626
------------------------------
2727

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: External Trigger Main
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
external-trigger-master:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2.3.3
11+
12+
- name: External Trigger
13+
if: github.ref == 'refs/heads/master'
14+
run: |
15+
echo "**** No external release, exiting ****"
16+
exit 0
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: External Trigger Scheduler
2+
3+
on:
4+
schedule:
5+
- cron: '43 * * * *'
6+
workflow_dispatch:
7+
8+
jobs:
9+
external-trigger-scheduler:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2.3.3
13+
with:
14+
fetch-depth: '0'
15+
16+
- name: External Trigger Scheduler
17+
run: |
18+
echo "**** Branches found: ****"
19+
git for-each-ref --format='%(refname:short)' refs/remotes
20+
echo "**** Pulling the yq docker image ****"
21+
docker pull ghcr.io/linuxserver/yq
22+
for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
23+
do
24+
br=$(echo "$br" | sed 's|origin/||g')
25+
echo "**** Evaluating branch ${br} ****"
26+
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-gmail-order-bot/${br}/jenkins-vars.yml \
27+
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
28+
if [ "$br" == "$ls_branch" ]; then
29+
echo "**** Branch ${br} appears to be live; checking workflow. ****"
30+
if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-gmail-order-bot/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
31+
echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
32+
curl -iX POST \
33+
-H "Authorization: token ${{ secrets.CR_PAT }}" \
34+
-H "Accept: application/vnd.github.v3+json" \
35+
-d "{\"ref\":\"refs/heads/${br}\"}" \
36+
https://api.github.com/repos/linuxserver/docker-gmail-order-bot/actions/workflows/external_trigger.yml/dispatches
37+
else
38+
echo "**** Workflow doesn't exist; skipping trigger. ****"
39+
fi
40+
else
41+
echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
42+
fi
43+
done

.github/workflows/greetings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
steps:
99
- uses: actions/first-interaction@v1
1010
with:
11-
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [issue template](https://github.com/linuxserver/docker-gmail-order-bot/blob/master/.github/ISSUE_TEMPLATE.md)!'
12-
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-gmail-order-bot/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
11+
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/lsiodev/docker-gmail-order-bot/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/lsiodev/docker-gmail-order-bot/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
12+
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/lsiodev/docker-gmail-order-bot/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Package Trigger Main
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
package-trigger-master:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/checkout@v2.3.3
11+
12+
- name: Package Trigger
13+
if: github.ref == 'refs/heads/master'
14+
run: |
15+
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_GMAIL_ORDER_BOT_MASTER }}" ]; then
16+
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_GMAIL_ORDER_BOT_MASTER is set; skipping trigger. ****"
17+
exit 0
18+
fi
19+
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-gmail-order-bot/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
20+
echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
21+
exit 0
22+
fi
23+
echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_GMAIL_ORDER_BOT_MASTER\". ****"
24+
response=$(curl -iX POST \
25+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-gmail-order-bot/job/master/buildWithParameters?PACKAGE_CHECK=true \
26+
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
27+
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
28+
echo "**** Sleeping 10 seconds until job starts ****"
29+
sleep 10
30+
buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
31+
buildurl="${buildurl%$'\r'}"
32+
echo "**** Jenkins job build url: ${buildurl} ****"
33+
echo "**** Attempting to change the Jenkins job description ****"
34+
curl -iX POST \
35+
"${buildurl}submitDescription" \
36+
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
37+
--data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
38+
--data-urlencode "Submit=Submit"

0 commit comments

Comments
 (0)