Skip to content

Commit f619ed4

Browse files
Run update.sh
1 parent 6dba150 commit f619ed4

File tree

3 files changed

+79
-32
lines changed

3 files changed

+79
-32
lines changed

elixir/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ WARNING:
2424

2525
# Supported tags and respective `Dockerfile` links
2626

27-
- [`1.12.2`, `1.12`, `latest`](https://github.com/erlef/docker-elixir/blob/2b5da5abf10f3026d01b6dda3c509f4f09f60063/1.12/Dockerfile)
28-
- [`1.12.2-slim`, `1.12-slim`, `slim`](https://github.com/erlef/docker-elixir/blob/2b5da5abf10f3026d01b6dda3c509f4f09f60063/1.12/slim/Dockerfile)
29-
- [`1.12.2-alpine`, `1.12-alpine`, `alpine`](https://github.com/erlef/docker-elixir/blob/2b5da5abf10f3026d01b6dda3c509f4f09f60063/1.12/alpine/Dockerfile)
27+
- [`1.12.3`, `1.12`, `latest`](https://github.com/erlef/docker-elixir/blob/a7a9a8ecd02b6e31e93cfa13d8c18de0328f6e1a/1.12/Dockerfile)
28+
- [`1.12.3-slim`, `1.12-slim`, `slim`](https://github.com/erlef/docker-elixir/blob/a7a9a8ecd02b6e31e93cfa13d8c18de0328f6e1a/1.12/slim/Dockerfile)
29+
- [`1.12.3-alpine`, `1.12-alpine`, `alpine`](https://github.com/erlef/docker-elixir/blob/a7a9a8ecd02b6e31e93cfa13d8c18de0328f6e1a/1.12/alpine/Dockerfile)
3030
- [`1.11.4`, `1.11`](https://github.com/erlef/docker-elixir/blob/045351a425a16578309053fa8f729f046fcd616f/1.11/Dockerfile)
3131
- [`1.11.4-slim`, `1.11-slim`](https://github.com/erlef/docker-elixir/blob/045351a425a16578309053fa8f729f046fcd616f/1.11/slim/Dockerfile)
3232
- [`1.11.4-alpine`, `1.11-alpine`](https://github.com/erlef/docker-elixir/blob/045351a425a16578309053fa8f729f046fcd616f/1.11/alpine/Dockerfile)

node/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ WARNING:
2424

2525
# Supported tags and respective `Dockerfile` links
2626

27-
- [`16-alpine3.11`, `16.8-alpine3.11`, `16.8.0-alpine3.11`, `alpine3.11`, `current-alpine3.11`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/alpine3.11/Dockerfile)
28-
- [`16-alpine3.12`, `16.8-alpine3.12`, `16.8.0-alpine3.12`, `alpine3.12`, `current-alpine3.12`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/alpine3.12/Dockerfile)
29-
- [`16-alpine`, `16-alpine3.13`, `16.8-alpine`, `16.8-alpine3.13`, `16.8.0-alpine`, `16.8.0-alpine3.13`, `alpine`, `alpine3.13`, `current-alpine`, `current-alpine3.13`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/alpine3.13/Dockerfile)
30-
- [`16-alpine3.14`, `16.8-alpine3.14`, `16.8.0-alpine3.14`, `alpine3.14`, `current-alpine3.14`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/alpine3.14/Dockerfile)
31-
- [`16-bullseye`, `16.8-bullseye`, `16.8.0-bullseye`, `bullseye`, `current-bullseye`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/bullseye/Dockerfile)
32-
- [`16-bullseye-slim`, `16.8-bullseye-slim`, `16.8.0-bullseye-slim`, `bullseye-slim`, `current-bullseye-slim`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/bullseye-slim/Dockerfile)
33-
- [`16`, `16-buster`, `16.8`, `16.8-buster`, `16.8.0`, `16.8.0-buster`, `buster`, `current`, `current-buster`, `latest`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/buster/Dockerfile)
34-
- [`16-buster-slim`, `16-slim`, `16.8-buster-slim`, `16.8-slim`, `16.8.0-buster-slim`, `16.8.0-slim`, `buster-slim`, `current-buster-slim`, `current-slim`, `slim`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/buster-slim/Dockerfile)
35-
- [`16-stretch`, `16.8-stretch`, `16.8.0-stretch`, `current-stretch`, `stretch`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/stretch/Dockerfile)
36-
- [`16-stretch-slim`, `16.8-stretch-slim`, `16.8.0-stretch-slim`, `current-stretch-slim`, `stretch-slim`](https://github.com/nodejs/docker-node/blob/3047652162a4f83f68260aabfdbb688e58e7b152/16/stretch-slim/Dockerfile)
27+
- [`16-alpine3.11`, `16.9-alpine3.11`, `16.9.0-alpine3.11`, `alpine3.11`, `current-alpine3.11`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/alpine3.11/Dockerfile)
28+
- [`16-alpine3.12`, `16.9-alpine3.12`, `16.9.0-alpine3.12`, `alpine3.12`, `current-alpine3.12`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/alpine3.12/Dockerfile)
29+
- [`16-alpine`, `16-alpine3.13`, `16.9-alpine`, `16.9-alpine3.13`, `16.9.0-alpine`, `16.9.0-alpine3.13`, `alpine`, `alpine3.13`, `current-alpine`, `current-alpine3.13`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/alpine3.13/Dockerfile)
30+
- [`16-alpine3.14`, `16.9-alpine3.14`, `16.9.0-alpine3.14`, `alpine3.14`, `current-alpine3.14`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/alpine3.14/Dockerfile)
31+
- [`16-bullseye`, `16.9-bullseye`, `16.9.0-bullseye`, `bullseye`, `current-bullseye`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/bullseye/Dockerfile)
32+
- [`16-bullseye-slim`, `16.9-bullseye-slim`, `16.9.0-bullseye-slim`, `bullseye-slim`, `current-bullseye-slim`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/bullseye-slim/Dockerfile)
33+
- [`16`, `16-buster`, `16.9`, `16.9-buster`, `16.9.0`, `16.9.0-buster`, `buster`, `current`, `current-buster`, `latest`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/buster/Dockerfile)
34+
- [`16-buster-slim`, `16-slim`, `16.9-buster-slim`, `16.9-slim`, `16.9.0-buster-slim`, `16.9.0-slim`, `buster-slim`, `current-buster-slim`, `current-slim`, `slim`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/buster-slim/Dockerfile)
35+
- [`16-stretch`, `16.9-stretch`, `16.9.0-stretch`, `current-stretch`, `stretch`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/stretch/Dockerfile)
36+
- [`16-stretch-slim`, `16.9-stretch-slim`, `16.9.0-stretch-slim`, `current-stretch-slim`, `stretch-slim`](https://github.com/nodejs/docker-node/blob/efbd2fac720142152514b35efe49bda3402dba8c/16/stretch-slim/Dockerfile)
3737
- [`14-alpine`, `14-alpine3.11`, `14.17-alpine`, `14.17-alpine3.11`, `14.17.6-alpine`, `14.17.6-alpine3.11`, `fermium-alpine`, `fermium-alpine3.11`, `lts-alpine`, `lts-alpine3.11`](https://github.com/nodejs/docker-node/blob/dc340d0bf2119dee534106ef012e85861cda8b84/14/alpine3.11/Dockerfile)
3838
- [`14-alpine3.12`, `14.17-alpine3.12`, `14.17.6-alpine3.12`, `fermium-alpine3.12`, `lts-alpine3.12`](https://github.com/nodejs/docker-node/blob/dc340d0bf2119dee534106ef012e85861cda8b84/14/alpine3.12/Dockerfile)
3939
- [`14-alpine3.13`, `14.17-alpine3.13`, `14.17.6-alpine3.13`, `fermium-alpine3.13`, `lts-alpine3.13`](https://github.com/nodejs/docker-node/blob/dc340d0bf2119dee534106ef012e85861cda8b84/14/alpine3.13/Dockerfile)

yourls/README.md

Lines changed: 66 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ YOURLS is a set of PHP scripts that will allow you to run Your Own URL Shortener
5757

5858
# How to use this image
5959

60+
## Start a `yourls` server instance
61+
6062
```console
6163
$ docker run --name some-yourls --link some-mysql:mysql \
6264
-e YOURLS_SITE="https://example.com" \
@@ -65,36 +67,80 @@ $ docker run --name some-yourls --link some-mysql:mysql \
6567
-d yourls
6668
```
6769

68-
The YOURLS instance accepts [a number of environment variables for configuration](https://yourls.org/#Config).
69-
A few notable/important examples for using this Docker image include:
70+
The YOURLS instance accepts a number of environment variables for configuration, see *Environment Variables* section below.
7071

71-
- `-e YOURLS_DB_HOST=...` (defaults to the IP and port of the linked `mysql` container)
72-
- `-e YOURLS_DB_USER=...` (defaults to "root")
73-
- `-e YOURLS_DB_PASS=...` (defaults to the value of the `MYSQL_ROOT_PASSWORD` environment variable from the linked `mysql` container)
74-
- `-e YOURLS_DB_NAME=...` (defaults to "yourls")
75-
- `-e YOURLS_DB_PREFIX=...` (defaults to "yourls_", only set this when you need to override the default table prefix)
76-
- `-e YOURLS_COOKIEKEY=...` (default to unique random SHA1s)
77-
- `-e YOURLS_SITE=...` (yourls instance url)
78-
- `-e YOURLS_USER=...` (yourls instance user name)
79-
- `-e YOURLS_PASS=...` (yourls instance user password)
72+
If you'd like to use an external database instead of a linked `mysql` container, specify the hostname and port with `YOURLS_DB_HOST` along with the password in `YOURLS_DB_PASS` and the username in `YOURLS_DB_USER` (if it is something other than `root`):
8073

81-
If the `YOURLS_DB_NAME` specified does not already exist on the given MySQL server, it will be created automatically upon startup of the `yourls` container, provided that the `YOURLS_DB_USER` specified has the necessary permissions to create it.
74+
```console
75+
$ docker run --name some-yourlss -e YOURLS_DB_HOST=10.1.2.3:3306 \
76+
-e YOURLS_DB_USER=... -e YOURLS_DB_PASS=... -d yourls
77+
```
78+
79+
## Connect to the YOURLS administration interface
8280

8381
If you'd like to be able to access the instance from the host without the container's IP, standard port mappings can be used:
8482

8583
```console
8684
$ docker run --name some-yourls --link some-mysql:mysql -p 8080:80 -d yourls
8785
```
8886

89-
Then, access it via `http://localhost:8080/admin/` or `http://host-ip:8080/admin/` in a browser.
87+
Then, access it via `http://localhost:8080/admin/` or `http://<host-ip>:8080/admin/` in a browser.
9088

91-
If you'd like to use an external database instead of a linked `mysql` container, specify the hostname and port with `YOURLS_DB_HOST` along with the password in `YOURLS_DB_PASS` and the username in `YOURLS_DB_USER` (if it is something other than `root`):
89+
**Note:** On first instantiation, reaching the root folder will generate an error. Access the YOURLS administration interface via the path `/admin/`.
90+
91+
## Environment Variables
92+
93+
When you start the `yourls` image, you can adjust the configuration of the YOURLS instance by passing one or more environment variables on the `docker run` command line.
94+
The YOURLS instance accepts [a number of environment variables for configuration](https://yourls.org/#Config).
95+
A few notable/important examples for using this Docker image include the following.
96+
97+
### `YOURLS_SITE`
98+
99+
**Required.**
100+
YOURLS instance URL, no trailing slash, lowercase.
101+
102+
Example: `YOURLS_SITE="https://example.com"`
103+
104+
### `YOURLS_USER`
105+
106+
**Required.**
107+
YOURLS instance username.
108+
109+
Example: `YOURLS_USER="example_username"`
110+
111+
### `YOURLS_PASS`
112+
113+
**Required.**
114+
YOURLS instance password.
115+
116+
Example: `YOURLS_USER="example_password"`
117+
118+
### `YOURLS_DB_HOST`, `YOURLS_DB_USER`, `YOURLS_DB_PASS`
119+
120+
**Optional if linked `mysql` container.**
121+
122+
Host, user (defaults to "root") and password for the database.
123+
124+
### `YOURLS_DB_NAME`
125+
126+
**Optional.**
127+
Database name, defaults to "yourls". The database must have been created before installing YOURLS.
128+
129+
### `YOURLS_DB_PREFIX`
130+
131+
**Optional.**
132+
Database tables prefix, defaults to "yourls_". Only set this when you need to override the default table prefix.
133+
134+
## Docker Secrets
135+
136+
As an alternative to passing sensitive information via environment variables, `_FILE` may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in `/run/secrets/<secret_name>` files. For example:
92137

93138
```console
94-
$ docker run --name some-yourlss -e YOURLS_DB_HOST=10.1.2.3:3306 \
95-
-e YOURLS_DB_USER=... -e YOURLS_DB_PASS=... -d yourls
139+
$ docker run --name some-yourls -e YOURLS_DB_PASS_FILE=/run/secrets/mysql-root ... -d yourls:tag
96140
```
97141

142+
Currently, this is supported for `YOURLS_DB_HOST`, `YOURLS_DB_USER`, `YOURLS_DB_PASS`, `YOURLS_DB_NAME`, `YOURLS_DB_PREFIX`, `YOURLS_SITE`, `YOURLS_USER`, and `YOURLS_PASS`.
143+
98144
## ... via [`docker stack deploy`](https://docs.docker.com/engine/reference/commandline/stack_deploy/) or [`docker-compose`](https://github.com/docker/compose)
99145

100146
Example `stack.yml` for `yourls`:
@@ -116,15 +162,16 @@ services:
116162
YOURLS_PASS: example_password
117163

118164
mysql:
119-
image: mysql:5.7
165+
image: mysql
120166
restart: always
121167
environment:
122168
MYSQL_ROOT_PASSWORD: example
169+
MYSQL_DATABASE: yourls
123170
```
124171
125-
[![Try in PWD](https://github.com/play-with-docker/stacks/raw/cff22438cb4195ace27f9b15784bbb497047afa7/assets/images/button.png)](http://play-with-docker.com?stack=https://raw.githubusercontent.com/docker-library/docs/be1a84b44ec3c028aa0ac5a9c8e413e43dfe05e4/yourls/stack.yml)
172+
[![Try in PWD](https://github.com/play-with-docker/stacks/raw/cff22438cb4195ace27f9b15784bbb497047afa7/assets/images/button.png)](http://play-with-docker.com?stack=https://raw.githubusercontent.com/docker-library/docs/6dba1507190ff91149046ce4bcbac43529d76bd4/yourls/stack.yml)
126173
127-
Run `docker stack deploy -c stack.yml yourls` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080/admin/`, `http://localhost:8080/admin/`, or `http://host-ip:8080/admin/` (as appropriate).
174+
Run `docker stack deploy -c stack.yml yourls` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080/admin/`, `http://localhost:8080/admin/`, or `http://<host-ip>:8080/admin/` (as appropriate).
128175

129176
## Adding additional libraries / extensions
130177

0 commit comments

Comments
 (0)