Skip to content

Commit b7c4f86

Browse files
Bot Updating Templated Files
1 parent c1df374 commit b7c4f86

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
1515
indent_style = space
1616
indent_size = 2
1717

18-
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
18+
[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
1919
indent_style = space
2020
indent_size = 4

.github/workflows/greetings.yml

Lines changed: 1 addition & 1 deletion
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 [bug](https://github.com/linuxserver/docker-mariadb/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-mariadb/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
11+
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
1212
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-mariadb/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/permissions.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Permission check
2+
on:
3+
pull_request:
4+
paths:
5+
- '**/run'
6+
- '**/finish'
7+
jobs:
8+
permission_check:
9+
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The architectures supported by this image are:
5656
| :----: | :----: | ---- |
5757
| x86-64 || amd64-\<version tag\> |
5858
| arm64 || arm64v8-\<version tag\> |
59-
| armhf|| arm32v7-\<version tag\> |
59+
| armhf || arm32v7-\<version tag\> |
6060

6161
## Application Setup
6262

@@ -126,8 +126,8 @@ services:
126126
environment:
127127
- PUID=1000
128128
- PGID=1000
129+
- TZ=Etc/UTC
129130
- MYSQL_ROOT_PASSWORD=ROOT_ACCESS_PASSWORD
130-
- TZ=Europe/London
131131
- MYSQL_DATABASE=USER_DB_NAME #optional
132132
- MYSQL_USER=MYSQL_USER #optional
133133
- MYSQL_PASSWORD=DATABASE_PASSWORD #optional
@@ -146,8 +146,8 @@ docker run -d \
146146
--name=mariadb \
147147
-e PUID=1000 \
148148
-e PGID=1000 \
149+
-e TZ=Etc/UTC \
149150
-e MYSQL_ROOT_PASSWORD=ROOT_ACCESS_PASSWORD \
150-
-e TZ=Europe/London \
151151
-e MYSQL_DATABASE=USER_DB_NAME `#optional` \
152152
-e MYSQL_USER=MYSQL_USER `#optional` \
153153
-e MYSQL_PASSWORD=DATABASE_PASSWORD `#optional` \
@@ -156,6 +156,7 @@ docker run -d \
156156
-v path_to_data:/config \
157157
--restart unless-stopped \
158158
lscr.io/linuxserver/mariadb:latest
159+
159160
```
160161

161162
## Parameters
@@ -167,8 +168,8 @@ Container images are configured using parameters passed at runtime (such as thos
167168
| `-p 3306` | Mariadb listens on this port. |
168169
| `-e PUID=1000` | for UserID - see below for explanation |
169170
| `-e PGID=1000` | for GroupID - see below for explanation |
171+
| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
170172
| `-e MYSQL_ROOT_PASSWORD=ROOT_ACCESS_PASSWORD` | Set this to root password for installation (minimum 4 characters & non-alphanumeric passwords must be properly escaped). |
171-
| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
172173
| `-e MYSQL_DATABASE=USER_DB_NAME` | Specify the name of a database to be created on image startup. |
173174
| `-e MYSQL_USER=MYSQL_USER` | This user will have superuser access to the database specified by MYSQL_DATABASE (do not use root here). |
174175
| `-e MYSQL_PASSWORD=DATABASE_PASSWORD` | Set this to the password you want to use for you MYSQL_USER (minimum 4 characters & non-alphanumeric passwords must be properly escaped). |

0 commit comments

Comments
 (0)