From f66c2d3fd020637920173039503c1f8891369a49 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Tue, 17 Sep 2024 17:09:10 -0700 Subject: [PATCH] Run update.sh --- arangodb/README.md | 79 +++++++++++++++++++++++++++++++--------------- joomla/README.md | 18 +++++------ node/README.md | 12 +++---- 3 files changed, 68 insertions(+), 41 deletions(-) diff --git a/arangodb/README.md b/arangodb/README.md index 7c62020711cb..039c8355684f 100644 --- a/arangodb/README.md +++ b/arangodb/README.md @@ -67,8 +67,8 @@ ArangoDB runs everywhere: On-prem, in the cloud, and as a managed cloud service: #### ArangoDB Documentation -- [Learn ArangoDB](https://www.arangodb.com/learn/) -- [Documentation](https://www.arangodb.com/docs/) +- [Learn ArangoDB](https://arangodb.com/learn/) +- [Documentation](https://docs.arangodb.com/) ## How to use this image @@ -77,26 +77,44 @@ ArangoDB runs everywhere: On-prem, in the cloud, and as a managed cloud service: In order to start an ArangoDB instance, run: ```console -unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 -d --name arangodb-instance arangodb +docker run -d -p 8529:8529 -e ARANGO_RANDOM_ROOT_PASSWORD=1 --name arangodb-instance arangodb ``` -Will create and launch the arangodb docker instance as background process. The Identifier of the process is printed. By default ArangoDB listen on port 8529 for request and the image includes `EXPOSE 8529`. If you link an application container it is automatically available in the linked container. See the following examples. +Docker chooses the processor architecture for the image that matches your host CPU by default. If this is not the case, for example, because you have the `DOCKER_DEFAULT_PLATFORM` environment variable set to a different architecture, you can pass the `--platform` flag to the `docker run` command to specify the appropriate operating system and architecture for the container. For x86-64, use `linux/amd64`. On ARM, especially Apple silicon with no emulation for the required AVX instruction set extension, use `linux/arm64/v8`: -In order to get the IP arango listens on, run: +```console +docker run -d -p 8529:8529 -e ARANGO_RANDOM_ROOT_PASSWORD=1 --name arangodb-instance --platform linux/arm64/v8 arangodb +``` + +This creates and launches the arangodb Docker instance as a background process. The Identifier of the process is printed. By default, ArangoDB listens on port `8529` for requests. + +In order to get the IP ArangoDB listens on, run: ```console -unix> docker inspect --format '{{ .NetworkSettings.IPAddress }}' arangodb-instance +docker inspect --format '{{ .NetworkSettings.IPAddress }}' arangodb-instance ``` +### Initialize the server language + +When using Docker, you need to specify the language you want to initialize the server to on the first run in one of the following ways: + +- Set the environment variable `LANG` to a locale in the `docker run` command, e.g. `-e LANG=sv` for a Swedish locale. + +- Use an `arangod.conf` configuration file that sets a language and mount it into the container. For example, create a configuration file on your host system in which you set `icu-language = sv` at the top (before any `[section]`) and then mount the file over the default configuration file like `docker run -v /your-host-path/arangod.conf:/etc/arangodb3/arangod.conf ...`. + +Note that you cannot set the language using only a startup option on the command-line, like `docker run ... arangodb --icu-language sv`. + +If you don't specify a language explicitly, the default is `en_US` up to ArangoDB v3.11 and `en_US_POSIX` from ArangoDB v3.12 onward. + ### Using the instance -In order to use the running instance from an application, link the container: +To use the running instance from an application, link the container: ```console -unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 --name my-app --link arangodb-instance:db-link arangodb +docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 --name my-app --link arangodb-instance:db-link arangodb ``` -This will use the instance with the name `arangodb-instance` and link it into the application container. The application container will contain environment variables +This uses the instance named `arangodb-instance` and links it into the application container. The application container contains environment variables, which can be used to access the database. DB_LINK_PORT_8529_TCP=tcp://172.17.0.17:8529 DB_LINK_PORT_8529_TCP_ADDR=172.17.0.17 @@ -104,14 +122,12 @@ This will use the instance with the name `arangodb-instance` and link it into th DB_LINK_PORT_8529_TCP_PROTO=tcp DB_LINK_NAME=/naughty_ardinghelli/db-link -These can be used to access the database. - ### Exposing the port to the outside world If you want to expose the port to the outside world, run: ```console -unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 -p 8529:8529 -d arangodb +docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 -p 8529:8529 -d arangodb ``` ArangoDB listen on port 8529 for request and the image includes `EXPOSE @@ -142,7 +158,7 @@ Note: this way of specifying logins only applies to single server installations. You can pass arguments to the ArangoDB server by appending them to the end of the Docker command: ```console -unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 arangodb --help +docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 arangodb --help ``` The entrypoint script starts the `arangod` binary by default and forwards your arguments. @@ -150,13 +166,18 @@ The entrypoint script starts the `arangod` binary by default and forwards your a You may also start other binaries, such as the ArangoShell: ```console -unix> docker run -it arangodb arangosh --server.database myDB ... +docker run -it arangodb arangosh --server.database myDB ... ``` Note that you need to set up networking for containers if `arangod` runs in one container and you want to access it with `arangosh` running in another container. It is easier to execute it in the same container instead. Use `docker ps` to find out the container ID / name of a running container: ```console -unix> docker ps +docker ps +``` + +It prints something similar to the following: + +```console CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 1234567890ab arangodb "/entrypoint.sh aran…" 2 hours ago Up 2 hours 0.0.0.0:8529->8529/tcp jolly_joker ``` @@ -164,10 +185,10 @@ CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS Then use `docker exec` and the ID / name to run something inside of the existing container: ```console -unix> docker exec -it jolly_joker arangosh +docker exec -it jolly_joker arangosh ``` -See more information about [Configuration](https://www.arangodb.com/docs/stable/administration-configuration.html) +For more information, see the ArangoDB documentation about [Configuration](https://docs.arangodb.com/stable/operations/administration/configuration/). ### Limiting resource utilization @@ -198,7 +219,7 @@ ArangoDB supports two different storage engines from version 3.2 to 3.6. You can ArangoDB uses the volume `/var/lib/arangodb3` as database directory to store the collection data and the volume `/var/lib/arangodb3-apps` as apps directory to store any extensions. These directories are marked as docker volumes. -See `docker inspect --format "{{ .Config.Volumes}}" arangodb` for all volumes. +See `docker inspect --format "{{ .Config.Volumes }}" arangodb` for all volumes. A good explanation about persistence and docker container can be found here: [Docker In-depth: Volumes](http://container42.com/2014/11/03/docker-indepth-volumes/), [Why Docker Data Containers are Good](https://medium.com/@ramangupta/why-docker-data-containers-are-good-589b3c6c749e) @@ -209,8 +230,8 @@ You can map the container's volumes to a directory on the host, so that the data ```console unix> mkdir /tmp/arangodb unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 -p 8529:8529 -d \ - -v /tmp/arangodb:/var/lib/arangodb3 \ - arangodb + -v /tmp/arangodb:/var/lib/arangodb3 \ + arangodb ``` This will use the `/tmp/arangodb` directory of the host as database directory for ArangoDB inside the container. @@ -220,22 +241,22 @@ This will use the `/tmp/arangodb` directory of the host as database directory fo Alternatively you can create a container holding the data. ```console -unix> docker create --name arangodb-persist arangodb true +docker create --name arangodb-persist arangodb true ``` And use this data container in your ArangoDB container. ```console -unix> docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 --volumes-from arangodb-persist -p 8529:8529 arangodb +docker run -e ARANGO_RANDOM_ROOT_PASSWORD=1 --volumes-from arangodb-persist -p 8529:8529 arangodb ``` If want to save a few bytes you can alternatively use [busybox](https://hub.docker.com/_/busybox) or [alpine](https://hub.docker.com/_/alpine) for creating the volume only containers. Please note that you need to provide the used volumes in this case. For example ```console -unix> docker run -d --name arangodb-persist -v /var/lib/arangodb3 busybox true +docker run -d --name arangodb-persist -v /var/lib/arangodb3 busybox true ``` -### Using as a base image +### Usage as a base image If you are using the image as a base image please make sure to wrap any CMD in the [exec](https://docs.docker.com/reference/dockerfile/#cmd) form. Otherwise the default entrypoint will not do its bootstrapping work. @@ -243,11 +264,17 @@ When deriving the image, you can control the instantiation via putting files int - `*.sh` - files ending with .sh will be run as a bash shellscript. - `*.js` - files will be executed with arangosh. You can specify additional arangosh arguments via the `ARANGOSH_ARGS` environment variable. -- `dumps/` - in this directory you can place subdirectories containing database dumps generated using [arangodump](https://www.arangodb.com/docs/stable/programs-arangodump.html). They can be restored using [arangorestore](https://www.arangodb.com/docs/stable/programs-arangorestore.html). +- `dumps/` - in this directory you can place subdirectories containing database dumps generated using [arangodump](https://docs.arangodb.com/stable/components/tools/arangodump/). They can be restored using [arangorestore](https://docs.arangodb.com/stable/components/tools/arangorestore/). # License -[ArangoDB itself is licensed under the Apache License](https://github.com/arangodb/arangodb/blob/devel/LICENSE), but it contains [software of third parties under their respective licenses](https://github.com/arangodb/arangodb/blob/devel/LICENSES-OTHER-COMPONENTS.md). +The official Docker images of the ArangoDB Community Edition are governed by the [ArangoDB Community License](https://arangodb.com/community-license/). The use for commercial purposes is limited to a 100 GB on dataset size in production within a single cluster and a maximum of three clusters. + +The source code of the Community Edition is available under the [Business Source License 1.1 (BUSL-1.1)](https://github.com/arangodb/arangodb/blob/devel/LICENSE). Copying, modification, redistribution, non-commercial use, and commercial use in a non-production context are always allowed. Additionally, you can deploy BUSL-licensed ArangoDB source code for any purpose (including production) as long as you are not creating a commercial derivative work or offering, or are including it in a commercial product, application, or service. On the fourth anniversary of the first publicly available distribution of a specific version, the license changes to the permissive Apache 2.0 open-source license. + +Up to ArangoDB version 3.11, ArangoDB is licensed under the [Apache 2.0 License](https://github.com/arangodb/arangodb/blob/3.11/LICENSE). + +ArangoDB contains [software of third parties under their respective licenses](https://github.com/arangodb/arangodb/blob/devel/LICENSES-OTHER-COMPONENTS.md). As with all Docker images, these likely also contain other software which may be under other licenses (such as Bash, etc from the base distribution, along with any direct or indirect dependencies of the primary software being contained). diff --git a/joomla/README.md b/joomla/README.md index 9d7fcd018af1..3aea9f22c888 100644 --- a/joomla/README.md +++ b/joomla/README.md @@ -24,23 +24,23 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`5.2.0-beta2-php8.1-apache`, `5.2-php8.1-apache`, `5.2.beta-php8.1-apache`, `5.2.0-beta-php8.1-apache`](https://github.com/joomla-docker/docker-joomla/blob/83dab9beee1efb5374b353de89aae1e97afeae35/5.2.beta/php8.1/apache/Dockerfile) +- [`5.2.0-beta3-php8.1-apache`, `5.2-php8.1-apache`, `5.2.beta-php8.1-apache`, `5.2.0-beta-php8.1-apache`](https://github.com/joomla-docker/docker-joomla/blob/ad9585a9185c597918f65afcd7b3a68676784f27/5.2.beta/php8.1/apache/Dockerfile) -- [`5.2.0-beta2-php8.1-fpm-alpine`, `5.2-php8.1-fpm-alpine`, `5.2.beta-php8.1-fpm-alpine`, `5.2.0-beta-php8.1-fpm-alpine`](https://github.com/joomla-docker/docker-joomla/blob/83dab9beee1efb5374b353de89aae1e97afeae35/5.2.beta/php8.1/fpm-alpine/Dockerfile) +- [`5.2.0-beta3-php8.1-fpm-alpine`, `5.2-php8.1-fpm-alpine`, `5.2.beta-php8.1-fpm-alpine`, `5.2.0-beta-php8.1-fpm-alpine`](https://github.com/joomla-docker/docker-joomla/blob/ad9585a9185c597918f65afcd7b3a68676784f27/5.2.beta/php8.1/fpm-alpine/Dockerfile) -- [`5.2.0-beta2-php8.1-fpm`, `5.2-php8.1-fpm`, `5.2.beta-php8.1-fpm`, `5.2.0-beta-php8.1-fpm`](https://github.com/joomla-docker/docker-joomla/blob/83dab9beee1efb5374b353de89aae1e97afeae35/5.2.beta/php8.1/fpm/Dockerfile) +- [`5.2.0-beta3-php8.1-fpm`, `5.2-php8.1-fpm`, `5.2.beta-php8.1-fpm`, `5.2.0-beta-php8.1-fpm`](https://github.com/joomla-docker/docker-joomla/blob/ad9585a9185c597918f65afcd7b3a68676784f27/5.2.beta/php8.1/fpm/Dockerfile) -- [`5.2.0-beta2`, `5.2`, `5.2.beta`, `5.2.0-beta`, `5.2.0-beta2-apache`, `5.2-apache`, `5.2.beta-apache`, `5.2.0-beta-apache`, `5.2.0-beta2-php8.2`, `5.2-php8.2`, `5.2.beta-php8.2`, `5.2.0-beta-php8.2`, `5.2.0-beta2-php8.2-apache`, `5.2-php8.2-apache`, `5.2.beta-php8.2-apache`, `5.2.0-beta-php8.2-apache`](https://github.com/joomla-docker/docker-joomla/blob/83dab9beee1efb5374b353de89aae1e97afeae35/5.2.beta/php8.2/apache/Dockerfile) +- [`5.2.0-beta3`, `5.2`, `5.2.beta`, `5.2.0-beta`, `5.2.0-beta3-apache`, `5.2-apache`, `5.2.beta-apache`, `5.2.0-beta-apache`, `5.2.0-beta3-php8.2`, `5.2-php8.2`, `5.2.beta-php8.2`, `5.2.0-beta-php8.2`, `5.2.0-beta3-php8.2-apache`, `5.2-php8.2-apache`, `5.2.beta-php8.2-apache`, `5.2.0-beta-php8.2-apache`](https://github.com/joomla-docker/docker-joomla/blob/ad9585a9185c597918f65afcd7b3a68676784f27/5.2.beta/php8.2/apache/Dockerfile) -- [`5.2.0-beta2-php8.2-fpm-alpine`, `5.2-php8.2-fpm-alpine`, `5.2.beta-php8.2-fpm-alpine`, `5.2.0-beta-php8.2-fpm-alpine`](https://github.com/joomla-docker/docker-joomla/blob/83dab9beee1efb5374b353de89aae1e97afeae35/5.2.beta/php8.2/fpm-alpine/Dockerfile) +- [`5.2.0-beta3-php8.2-fpm-alpine`, `5.2-php8.2-fpm-alpine`, `5.2.beta-php8.2-fpm-alpine`, `5.2.0-beta-php8.2-fpm-alpine`](https://github.com/joomla-docker/docker-joomla/blob/ad9585a9185c597918f65afcd7b3a68676784f27/5.2.beta/php8.2/fpm-alpine/Dockerfile) -- [`5.2.0-beta2-php8.2-fpm`, `5.2-php8.2-fpm`, `5.2.beta-php8.2-fpm`, `5.2.0-beta-php8.2-fpm`](https://github.com/joomla-docker/docker-joomla/blob/83dab9beee1efb5374b353de89aae1e97afeae35/5.2.beta/php8.2/fpm/Dockerfile) +- [`5.2.0-beta3-php8.2-fpm`, `5.2-php8.2-fpm`, `5.2.beta-php8.2-fpm`, `5.2.0-beta-php8.2-fpm`](https://github.com/joomla-docker/docker-joomla/blob/ad9585a9185c597918f65afcd7b3a68676784f27/5.2.beta/php8.2/fpm/Dockerfile) -- [`5.2.0-beta2-php8.3-apache`, `5.2-php8.3-apache`, `5.2.beta-php8.3-apache`, `5.2.0-beta-php8.3-apache`](https://github.com/joomla-docker/docker-joomla/blob/83dab9beee1efb5374b353de89aae1e97afeae35/5.2.beta/php8.3/apache/Dockerfile) +- [`5.2.0-beta3-php8.3-apache`, `5.2-php8.3-apache`, `5.2.beta-php8.3-apache`, `5.2.0-beta-php8.3-apache`](https://github.com/joomla-docker/docker-joomla/blob/ad9585a9185c597918f65afcd7b3a68676784f27/5.2.beta/php8.3/apache/Dockerfile) -- [`5.2.0-beta2-php8.3-fpm-alpine`, `5.2-php8.3-fpm-alpine`, `5.2.beta-php8.3-fpm-alpine`, `5.2.0-beta-php8.3-fpm-alpine`](https://github.com/joomla-docker/docker-joomla/blob/83dab9beee1efb5374b353de89aae1e97afeae35/5.2.beta/php8.3/fpm-alpine/Dockerfile) +- [`5.2.0-beta3-php8.3-fpm-alpine`, `5.2-php8.3-fpm-alpine`, `5.2.beta-php8.3-fpm-alpine`, `5.2.0-beta-php8.3-fpm-alpine`](https://github.com/joomla-docker/docker-joomla/blob/ad9585a9185c597918f65afcd7b3a68676784f27/5.2.beta/php8.3/fpm-alpine/Dockerfile) -- [`5.2.0-beta2-php8.3-fpm`, `5.2-php8.3-fpm`, `5.2.beta-php8.3-fpm`, `5.2.0-beta-php8.3-fpm`](https://github.com/joomla-docker/docker-joomla/blob/83dab9beee1efb5374b353de89aae1e97afeae35/5.2.beta/php8.3/fpm/Dockerfile) +- [`5.2.0-beta3-php8.3-fpm`, `5.2-php8.3-fpm`, `5.2.beta-php8.3-fpm`, `5.2.0-beta-php8.3-fpm`](https://github.com/joomla-docker/docker-joomla/blob/ad9585a9185c597918f65afcd7b3a68676784f27/5.2.beta/php8.3/fpm/Dockerfile) - [`5.1.4-php8.1-apache`, `5.1-php8.1-apache`, `5-php8.1-apache`, `php8.1-apache`](https://github.com/joomla-docker/docker-joomla/blob/a3a857bb7d9864dbe7b2092e68ee93e9f2bdc463/5.1/php8.1/apache/Dockerfile) diff --git a/node/README.md b/node/README.md index 6feafa4923b2..51792a5824ae 100644 --- a/node/README.md +++ b/node/README.md @@ -24,17 +24,17 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`22-alpine3.19`, `22.8-alpine3.19`, `22.8.0-alpine3.19`, `alpine3.19`, `current-alpine3.19`](https://github.com/nodejs/docker-node/blob/0c0069246367ac5ac0fc6bca141fb04faaca2f4b/22/alpine3.19/Dockerfile) +- [`22-alpine3.19`, `22.9-alpine3.19`, `22.9.0-alpine3.19`, `alpine3.19`, `current-alpine3.19`](https://github.com/nodejs/docker-node/blob/58c3b39e5948f82c594395857193cd97d01c690e/22/alpine3.19/Dockerfile) -- [`22-alpine`, `22-alpine3.20`, `22.8-alpine`, `22.8-alpine3.20`, `22.8.0-alpine`, `22.8.0-alpine3.20`, `alpine`, `alpine3.20`, `current-alpine`, `current-alpine3.20`](https://github.com/nodejs/docker-node/blob/0c0069246367ac5ac0fc6bca141fb04faaca2f4b/22/alpine3.20/Dockerfile) +- [`22-alpine`, `22-alpine3.20`, `22.9-alpine`, `22.9-alpine3.20`, `22.9.0-alpine`, `22.9.0-alpine3.20`, `alpine`, `alpine3.20`, `current-alpine`, `current-alpine3.20`](https://github.com/nodejs/docker-node/blob/58c3b39e5948f82c594395857193cd97d01c690e/22/alpine3.20/Dockerfile) -- [`22`, `22-bookworm`, `22.8`, `22.8-bookworm`, `22.8.0`, `22.8.0-bookworm`, `bookworm`, `current`, `current-bookworm`, `latest`](https://github.com/nodejs/docker-node/blob/0c0069246367ac5ac0fc6bca141fb04faaca2f4b/22/bookworm/Dockerfile) +- [`22`, `22-bookworm`, `22.9`, `22.9-bookworm`, `22.9.0`, `22.9.0-bookworm`, `bookworm`, `current`, `current-bookworm`, `latest`](https://github.com/nodejs/docker-node/blob/58c3b39e5948f82c594395857193cd97d01c690e/22/bookworm/Dockerfile) -- [`22-bookworm-slim`, `22-slim`, `22.8-bookworm-slim`, `22.8-slim`, `22.8.0-bookworm-slim`, `22.8.0-slim`, `bookworm-slim`, `current-bookworm-slim`, `current-slim`, `slim`](https://github.com/nodejs/docker-node/blob/0c0069246367ac5ac0fc6bca141fb04faaca2f4b/22/bookworm-slim/Dockerfile) +- [`22-bookworm-slim`, `22-slim`, `22.9-bookworm-slim`, `22.9-slim`, `22.9.0-bookworm-slim`, `22.9.0-slim`, `bookworm-slim`, `current-bookworm-slim`, `current-slim`, `slim`](https://github.com/nodejs/docker-node/blob/58c3b39e5948f82c594395857193cd97d01c690e/22/bookworm-slim/Dockerfile) -- [`22-bullseye`, `22.8-bullseye`, `22.8.0-bullseye`, `bullseye`, `current-bullseye`](https://github.com/nodejs/docker-node/blob/0c0069246367ac5ac0fc6bca141fb04faaca2f4b/22/bullseye/Dockerfile) +- [`22-bullseye`, `22.9-bullseye`, `22.9.0-bullseye`, `bullseye`, `current-bullseye`](https://github.com/nodejs/docker-node/blob/58c3b39e5948f82c594395857193cd97d01c690e/22/bullseye/Dockerfile) -- [`22-bullseye-slim`, `22.8-bullseye-slim`, `22.8.0-bullseye-slim`, `bullseye-slim`, `current-bullseye-slim`](https://github.com/nodejs/docker-node/blob/0c0069246367ac5ac0fc6bca141fb04faaca2f4b/22/bullseye-slim/Dockerfile) +- [`22-bullseye-slim`, `22.9-bullseye-slim`, `22.9.0-bullseye-slim`, `bullseye-slim`, `current-bullseye-slim`](https://github.com/nodejs/docker-node/blob/58c3b39e5948f82c594395857193cd97d01c690e/22/bullseye-slim/Dockerfile) - [`20-alpine3.19`, `20.17-alpine3.19`, `20.17.0-alpine3.19`, `iron-alpine3.19`, `lts-alpine3.19`](https://github.com/nodejs/docker-node/blob/410410f6955bf8d052ef3ec7988cd41a54eab879/20/alpine3.19/Dockerfile)