From 8b35a43795bda4f4ca1299bee2d02afe2434ee7f Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Wed, 20 Dec 2023 14:24:39 -0800 Subject: [PATCH] Typo fixes And some stack.yml version updates --- amazonlinux/content.md | 2 +- caddy/content.md | 2 +- cassandra/content.md | 2 +- drupal/stack.yml | 4 ++-- ghost/stack.yml | 2 +- joomla/stack.yml | 2 +- lightstreamer/content.md | 2 +- nextcloud/content.md | 2 +- postfixadmin/stack.yml | 2 +- redmine/stack.yml | 2 +- satosa/content.md | 2 +- wordpress/stack.yml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/amazonlinux/content.md b/amazonlinux/content.md index 317c0f205639..15b308c6242d 100644 --- a/amazonlinux/content.md +++ b/amazonlinux/content.md @@ -23,7 +23,7 @@ Note that Docker Hub's vulnerability scanning for Amazon Linux is currently base ## What is Amazon Linux 2023? - Amazon Linux 2023: https://aws.amazon.com/linux/amazon-linux-2023/ -- 2023.0 Release Notes: https://docs.aws.amazon.com/linux/al2023/release-notes/relnotes.html +- 2023 Release Notes: https://docs.aws.amazon.com/linux/al2023/release-notes/relnotes.html - FAQs: https://aws.amazon.com/linux/amazon-linux-2023/faqs/ - What's New: https://aws.amazon.com/about-aws/whats-new/2023/03/amazon-linux-2023/ - User Guide: https://docs.aws.amazon.com/linux/al2023/ug/what-is-amazon-linux.html diff --git a/caddy/content.md b/caddy/content.md index f97e70bff147..7999442e934a 100644 --- a/caddy/content.md +++ b/caddy/content.md @@ -90,7 +90,7 @@ FROM %%IMAGE%%: COPY --from=builder /usr/bin/caddy /usr/bin/caddy ``` -Note the second `FROM` instruction - this produces a much smaller image by simply overlaying the newly-built binary on top of the the regular `%%IMAGE%%` image. +Note the second `FROM` instruction - this produces a much smaller image by simply overlaying the newly-built binary on top of the regular `%%IMAGE%%` image. The [`xcaddy`](https://caddyserver.com/docs/build#xcaddy) tool is used to [build a new Caddy entrypoint](https://github.com/caddyserver/caddy/blob/4217217badf220d7d2c25f43f955fdc8454f2c64/cmd/caddy/main.go#L15..L25), with the provided modules. You can specify just a module name, or a name with a version (separated by `@`). You can also specify a specific version (can be a version tag or commit hash) of Caddy to build from. Read more about [`xcaddy` usage](https://github.com/caddyserver/xcaddy#command-usage). diff --git a/cassandra/content.md b/cassandra/content.md index cab3d2bcd26c..aab8b44fc57a 100644 --- a/cassandra/content.md +++ b/cassandra/content.md @@ -80,7 +80,7 @@ There are a small number of environment variables supported by the image which w - `CASSANDRA_START_RPC`: This variable is for controlling if the thrift rpc server is started. It will set the [`start_rpc`](http://docs.datastax.com/en/cassandra/3.0/cassandra/configuration/configCassandra_yaml.html?scroll=configCassandra_yaml__start_rpc) option in `cassandra.yaml`. -- `CASSANDRA_SEEDS`: This variable is the comma-separated list of IP addresses used by gossip for bootstrapping new nodes joining a cluster. It will set the `seeds` value of the [`seed_provider`](http://docs.datastax.com/en/cassandra/3.0/cassandra/configuration/configCassandra_yaml.html?scroll=configCassandra_yaml__seed_provider) option in `cassandra.yaml`. The `CASSANDRA_BROADCAST_ADDRESS` will be added the the seeds passed in so that the server will talk to itself as well. +- `CASSANDRA_SEEDS`: This variable is the comma-separated list of IP addresses used by gossip for bootstrapping new nodes joining a cluster. It will set the `seeds` value of the [`seed_provider`](http://docs.datastax.com/en/cassandra/3.0/cassandra/configuration/configCassandra_yaml.html?scroll=configCassandra_yaml__seed_provider) option in `cassandra.yaml`. The `CASSANDRA_BROADCAST_ADDRESS` will be added the seeds passed in so that the server will talk to itself as well. - `CASSANDRA_CLUSTER_NAME`: This variable sets the name of the cluster and must be the same for all nodes in the cluster. It will set the [`cluster_name`](http://docs.datastax.com/en/cassandra/3.0/cassandra/configuration/configCassandra_yaml.html?scroll=configCassandra_yaml__cluster_name) option of `cassandra.yaml`. diff --git a/drupal/stack.yml b/drupal/stack.yml index 4823d863d8b3..df58e27bc020 100644 --- a/drupal/stack.yml +++ b/drupal/stack.yml @@ -15,7 +15,7 @@ version: '3.1' services: drupal: - image: drupal:8-apache + image: drupal:10-apache ports: - 8080:80 volumes: @@ -29,7 +29,7 @@ services: restart: always postgres: - image: postgres:10 + image: postgres:16 environment: POSTGRES_PASSWORD: example restart: always diff --git a/ghost/stack.yml b/ghost/stack.yml index 9d495d941a06..fcf777580beb 100644 --- a/ghost/stack.yml +++ b/ghost/stack.yml @@ -3,7 +3,7 @@ version: '3.1' services: ghost: - image: ghost:4-alpine + image: ghost:5-alpine restart: always ports: - 8080:2368 diff --git a/joomla/stack.yml b/joomla/stack.yml index f1ac990db505..91b6f6a9f0b3 100644 --- a/joomla/stack.yml +++ b/joomla/stack.yml @@ -13,7 +13,7 @@ services: JOOMLA_DB_PASSWORD: example joomladb: - image: mysql:5.6 + image: mysql:8.0 restart: always environment: MYSQL_ROOT_PASSWORD: example diff --git a/lightstreamer/content.md b/lightstreamer/content.md index 93b07ec16e34..331b84d59ff4 100644 --- a/lightstreamer/content.md +++ b/lightstreamer/content.md @@ -43,7 +43,7 @@ Alternatively, the above tasks can be executed by deriving a new image through a ```dockerfile FROM %%IMAGE%% -# Please specify a COPY command only for the the required custom configuration file +# Please specify a COPY command only for the required custom configuration file COPY my-lightstreamer_conf.xml /lightstreamer/conf/lightstreamer_conf.xml COPY my-lightstreamer_log_conf.xml /lightstreamer/conf/lightstreamer_log_conf.xml ``` diff --git a/nextcloud/content.md b/nextcloud/content.md index 9c25a180c925..e327afda9ea2 100644 --- a/nextcloud/content.md +++ b/nextcloud/content.md @@ -278,7 +278,7 @@ Then run `docker-compose up -d`, now you can access Nextcloud at http://localhos ## Base version - FPM -When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples). +When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option. The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples). As this setup does **not include encryption**, it should be run behind a proxy. diff --git a/postfixadmin/stack.yml b/postfixadmin/stack.yml index b40e6c5b1abc..cef4054f9ee1 100644 --- a/postfixadmin/stack.yml +++ b/postfixadmin/stack.yml @@ -2,7 +2,7 @@ version: '3' services: db: - image: mysql:5.7 + image: mysql:8.0 restart: always environment: MYSQL_RANDOM_ROOT_PASSWORD: 1 diff --git a/redmine/stack.yml b/redmine/stack.yml index 5cfe77710c4e..0fc04fe7a28f 100644 --- a/redmine/stack.yml +++ b/redmine/stack.yml @@ -13,7 +13,7 @@ services: REDMINE_SECRET_KEY_BASE: supersecretkey db: - image: mysql:5.7 + image: mysql:8.0 restart: always environment: MYSQL_ROOT_PASSWORD: example diff --git a/satosa/content.md b/satosa/content.md index f00ab9e50c8b..fcba08015cf4 100644 --- a/satosa/content.md +++ b/satosa/content.md @@ -62,7 +62,7 @@ SATOSA uses encrypted cookies to track the progress of an authentication flow. T ### `SAML2_BACKEND_DISCO_SRV` -When part of a SAML2 multilateral federation, SATOSA will ask the user to choose an identity provider using a SAML discovery service. This environment variable optionally sets the the discovery service URL, which defaults to [SeamlessAccess](https://seamlessaccess.org/). +When part of a SAML2 multilateral federation, SATOSA will ask the user to choose an identity provider using a SAML discovery service. This environment variable optionally sets the discovery service URL, which defaults to [SeamlessAccess](https://seamlessaccess.org/). ### `SAML2_BACKEND_CERT` and `SAML2_BACKEND_KEY` diff --git a/wordpress/stack.yml b/wordpress/stack.yml index 68198d1ed648..ac4ca9abd223 100644 --- a/wordpress/stack.yml +++ b/wordpress/stack.yml @@ -16,7 +16,7 @@ services: - wordpress:/var/www/html db: - image: mysql:5.7 + image: mysql:8.0 restart: always environment: MYSQL_DATABASE: exampledb