Skip to content

Commit 16db02f

Browse files
authored
Merge pull request #73 from linuxserver/master-warning
Add warning about incoming rebase
2 parents bf39d8d + ec1a511 commit 16db02f

File tree

3 files changed

+42
-12
lines changed

3 files changed

+42
-12
lines changed

README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ The architectures supported by this image are:
5656
| arm64 | arm64v8-latest |
5757
| armhf | arm32v7-latest |
5858

59+
## Version Tags
60+
61+
This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
62+
63+
| Tag | Description |
64+
| :----: | --- |
65+
| latest | Currently using Ubuntu base images. Will be moved to the Alpine base in the near future. |
66+
| alpine | Releases with an Alpine base. |
5967

6068
## Usage
6169

@@ -174,13 +182,13 @@ Find custom.cnf in /config for config changes (restart container for them to tak
174182

175183
### Loading passwords and users from files
176184

177-
The `MYSQL_ROOT_PASSWORD MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD REMOTE_SQL` env values can be set in a file:
185+
The `MYSQL_ROOT_PASSWORD MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD REMOTE_SQL` env values can be set in a file:
178186

179187
```
180188
/config/env
181189
```
182190

183-
Using the following format:
191+
Using the following format:
184192

185193
```
186194
MYSQL_ROOT_PASSWORD="ROOT_ACCESS_PASSWORD"
@@ -273,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
273281

274282
## Versions
275283

284+
* **08.02.21:** - Release alpine tag. The alpine release will replace the latest tag in the near future.
276285
* **27.10.19:** - Bump to 10.4, ability use custom sql on initial init ,defining root passwords via file.
277286
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
278287
* **07.03.19:** - Add ability to setup a database and default user on first spinup.

readme-vars.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ available_architectures:
1515
- { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
1616

1717
# development version
18-
development_versions: false
18+
development_versions: true
19+
development_versions_items:
20+
- { tag: "latest", desc: "Currently using Ubuntu base images. Will be moved to the Alpine base in the near future." }
21+
- { tag: "alpine", desc: "Releases with an Alpine base." }
1922

2023
# container parameters
2124
common_param_env_vars_enabled: true
@@ -64,36 +67,37 @@ app_setup_block: |
6467
, the databases in /config/databases and the log in /config/log/myqsl
6568
6669
### Loading passwords and users from files
67-
68-
The `MYSQL_ROOT_PASSWORD MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD REMOTE_SQL` env values can be set in a file:
69-
70+
71+
The `MYSQL_ROOT_PASSWORD MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD REMOTE_SQL` env values can be set in a file:
72+
7073
```
7174
/config/env
7275
```
73-
74-
Using the following format:
75-
76+
77+
Using the following format:
78+
7679
```
7780
MYSQL_ROOT_PASSWORD="ROOT_ACCESS_PASSWORD"
7881
MYSQL_DATABASE="USER_DB_NAME"
7982
MYSQL_USER="MYSQL_USER"
8083
MYSQL_PASSWORD="DATABASE_PASSWORD"
8184
REMOTE_SQL="http://URL1/your.sql,https://URL2/your.sql"
8285
```
83-
86+
8487
These settings can be mixed and matched with Docker ENV settings as you require, but the settings in the file will always take precedence.
8588
8689
### Bootstrapping a new instance
87-
90+
8891
We support a one time run of custom sql files on init. In order to use this place `*.sql` files in:
89-
92+
9093
```
9194
/config/initdb.d/
9295
```
9396
This will have the same effect as setting the `REMOTE_SQL` environment variable. The sql will only be run on the containers first boot and setup.
9497
9598
# changelog
9699
changelogs:
100+
- { date: "08.02.21:", desc: "Release alpine tag. The alpine release will replace the latest tag in the near future." }
97101
- { date: "27.10.19:", desc: "Bump to 10.4, ability use custom sql on initial init ,defining root passwords via file." }
98102
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
99103
- { date: "07.03.19:", desc: "Add ability to setup a database and default user on first spinup." }

root/etc/cont-init.d/90-warning

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
echo '
4+
******************************************************
5+
******************************************************
6+
* *
7+
* *
8+
* This image will soon be rebased *
9+
* from ubuntu to alpine. *
10+
* Please be aware, this may cause issues *
11+
* It is strongly recommended to make backups *
12+
* of your config and databases before *
13+
* updating your image to the alpine base. *
14+
* *
15+
* *
16+
******************************************************
17+
******************************************************'

0 commit comments

Comments
 (0)