From 56798ba4051d863557e7e6256c452a9265745675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Colombaro?= Date: Wed, 29 Nov 2017 01:17:49 +0100 Subject: [PATCH 1/2] add yourls container documentation from https://github.com/YOURLS/docker-yourls --- yourls/README-short.txt | 1 + yourls/content.md | 56 ++++++++++++++++++++++++++++++++++++++++ yourls/github-repo | 1 + yourls/license.md | 1 + yourls/logo.png | Bin 0 -> 12112 bytes yourls/maintainer.md | 1 + yourls/stack.yml | 18 +++++++++++++ 7 files changed, 78 insertions(+) create mode 100644 yourls/README-short.txt create mode 100644 yourls/content.md create mode 100644 yourls/github-repo create mode 100644 yourls/license.md create mode 100644 yourls/logo.png create mode 100644 yourls/maintainer.md create mode 100644 yourls/stack.yml diff --git a/yourls/README-short.txt b/yourls/README-short.txt new file mode 100644 index 000000000..6a785f4ea --- /dev/null +++ b/yourls/README-short.txt @@ -0,0 +1 @@ +YOURLS is a set of PHP scripts that will allow you to run Your Own URL Shortener. diff --git a/yourls/content.md b/yourls/content.md new file mode 100644 index 000000000..b0f6392ff --- /dev/null +++ b/yourls/content.md @@ -0,0 +1,56 @@ +# What is YOURLS? + +YOURLS is a set of PHP scripts that will allow you to run Your Own URL Shortener. You'll have full control over your data, detailed stats, analytics, plugins, and more. It's free. + +> [github.com/YOURLS/YOURLS](https://github.com/YOURLS/YOURLS) + +%%LOGO%% + +# How to use this image + +```console +$ docker run --name some-%%REPO%% --link some-mysql:mysql -d %%IMAGE%% \ + -e YOURLS_SITE="https://example.com" +``` + +The following environment variables are also honored for configuring your YOURLS instance: + +- `-e YOURLS_DB_HOST=...` (defaults to the IP and port of the linked `mysql` container) +- `-e YOURLS_DB_USER=...` (defaults to "root") +- `-e YOURLS_DB_PASS=...` (defaults to the value of the `MYSQL_ROOT_PASSWORD` environment variable from the linked `mysql` container) +- `-e YOURLS_DB_NAME=...` (defaults to "yourls") +- `-e YOURLS_TABLE_PREFIX=...` (defaults to "", only set this when you need to override the default table prefix in wp-config.php) +- `-e YOURLS_COOKIEKEY=...` (default to unique random SHA1s) +- `-e YOURLS_SITE=...` (yourls instance url) + +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. + +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: + +```console +$ docker run --name some-%%REPO%% --link some-mysql:mysql -p 8080:80 -d %%IMAGE%% +``` + +Then, access it via `http://localhost:8080` or `http://host-ip:8080` in a browser. + +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`): + +```console +$ docker run --name some-%%REPO%%s -e YOURLS_DB_HOST=10.1.2.3:3306 \ + -e YOURLS_DB_USER=... -e YOURLS_DB_PASS=... -d %%REPO%% +``` + +## %%STACK%% + +Run `docker stack deploy -c stack.yml %%REPO%%` (or `docker-compose -f stack.yml up`), wait for it to initialize completely, and visit `http://swarm-ip:8080`, `http://localhost:8080`, or `http://host-ip:8080` (as appropriate). + +## Adding additional libraries / extensions + +This image does not provide any additional PHP extensions or other libraries, even if they are required by popular plugins. There are an infinite number of possible plugins, and they potentially require any extension PHP supports. Including every PHP extension that exists would dramatically increase the image size. + +If you need additional PHP extensions, you'll need to create your own image `FROM` this one. The [documentation of the `php` image](https://github.com/docker-library/docs/blob/master/php/README.md#how-to-install-more-php-extensions) explains how to compile additional extensions. + +The following Docker Hub features can help with the task of keeping your dependent images up-to-date: + +- [Automated Builds](https://docs.docker.com/docker-hub/builds/) let Docker Hub automatically build your Dockerfile each time you push changes to it. +- [Repository Links](https://docs.docker.com/docker-hub/builds/#repository-links) can ensure that your image is also rebuilt any time `%%REPO%%` is updated. diff --git a/yourls/github-repo b/yourls/github-repo new file mode 100644 index 000000000..b4d52b5a7 --- /dev/null +++ b/yourls/github-repo @@ -0,0 +1 @@ +https://github.com/YOURLS/docker-yourls diff --git a/yourls/license.md b/yourls/license.md new file mode 100644 index 000000000..e45b3d167 --- /dev/null +++ b/yourls/license.md @@ -0,0 +1 @@ +View [license information](https://github.com/YOURLS/YOURLS/blob/master/LICENSE) for the software contained in this image. diff --git a/yourls/logo.png b/yourls/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..91fc1507c3e5702c74c150ee820004b7345ed292 GIT binary patch literal 12112 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 Date: Wed, 18 Jul 2018 23:13:39 +0200 Subject: [PATCH 2/2] Fix some typos for YOURLS template --- yourls/content.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/yourls/content.md b/yourls/content.md index b0f6392ff..8bf7f32fc 100644 --- a/yourls/content.md +++ b/yourls/content.md @@ -9,8 +9,9 @@ YOURLS is a set of PHP scripts that will allow you to run Your Own URL Shortener # How to use this image ```console -$ docker run --name some-%%REPO%% --link some-mysql:mysql -d %%IMAGE%% \ - -e YOURLS_SITE="https://example.com" +$ docker run --name some-%%REPO%% --link some-mysql:mysql \ + -e YOURLS_SITE="https://example.com" \ + -d %%IMAGE%% ``` The following environment variables are also honored for configuring your YOURLS instance: @@ -37,7 +38,7 @@ If you'd like to use an external database instead of a linked `mysql` container, ```console $ docker run --name some-%%REPO%%s -e YOURLS_DB_HOST=10.1.2.3:3306 \ - -e YOURLS_DB_USER=... -e YOURLS_DB_PASS=... -d %%REPO%% + -e YOURLS_DB_USER=... -e YOURLS_DB_PASS=... -d %%IMAGE%% ``` ## %%STACK%%