Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1021 document lagoon base docker images #1323

Merged
merged 16 commits into from Nov 2, 2019

Conversation

@vincenzodnp
Copy link
Contributor

vincenzodnp commented Oct 18, 2019

Checklist

  • Affected Issues have been mentioned in the Closing issues section
  • Documentation has been written/updated.
  • Changelog entry has been written

Added detailed documentation of all Lagoon base images
Replaced, where possible, amazee.io with lagoon
Fix some typos

Changelog Entry

Improvement - Base images documentation (#1021 and #1236)

Closing issues

closes #1021 #1236

@vincenzodnp vincenzodnp requested a review from Schnitzel Oct 18, 2019
@vincenzodnp vincenzodnp requested review from dasrecht and tobybellwood Oct 19, 2019
docs/using_lagoon/docker_images/php-cli-drupal.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/php-cli.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/php-cli.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/rabbitmq.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/redis.md Outdated Show resolved Hide resolved
@Schnitzel Schnitzel mentioned this pull request Oct 20, 2019
2 of 3 tasks complete
Copy link
Contributor

tobybellwood left a comment

Few tidyups on image references etc - great work!

docs/using_lagoon/docker_images/nginx-drupal.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/nginx.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/php-cli.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/php-cli.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/php-cli.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/php-cli.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/php-fpm.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/redis.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/solr.md Outdated Show resolved Hide resolved
Copy link
Contributor Author

vincenzodnp left a comment

Added suggestions

@vincenzodnp

This comment has been minimized.

Copy link
Contributor Author

vincenzodnp commented Oct 21, 2019

Few tidyups on image references etc - great work!

Thanks @tobybellwood :)

docs/using_lagoon/docker_images/mariadb.md Outdated Show resolved Hide resolved
There are therefore some things already done:

- Folder permissions are automatically adapted with [`fix-permissions`](https://github.com/sclorg/s2i-base-container/blob/master/core/root/usr/bin/fix-permissions) so this image will work with a random user and therefore also on OpenShift.
- For all file's section, there are two `include` directives: the `prepend*.conf` and the `append*.conf`. They allow to add and append custom configuration to `drupal.conf` file

This comment has been minimized.

Copy link
@Schnitzel

Schnitzel Oct 23, 2019

Member

I think I would document this more clearer, the files are not called prepend*.conf but instead

  • /etc/nginx/conf.d/drupal/server_prepend*.conf;
  • /etc/nginx/conf.d/drupal/location_prepend*.conf;
  • /etc/nginx/conf.d/drupal/location_drupal_prepend*.conf;

so I would go a bit into the detail what each of these files does.

This comment has been minimized.

Copy link
@vincenzodnp

vincenzodnp Oct 24, 2019

Author Contributor

Done. Can you review please?

docs/using_lagoon/docker_images/nginx.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/php-cli-drupal.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/solr.md Outdated Show resolved Hide resolved
@vincenzodnp vincenzodnp requested review from Schnitzel and tobybellwood Oct 24, 2019
Copy link
Contributor

tobybellwood left a comment

couple more suggestions to split out solr-drupal and varnish-drupal images.
version of openresty in docs/using_lagoon/index.md is incorrect - currently at 1.15.8.2
corrected drupal launcher to drush launcher in php-cli-drupal

docs/using_lagoon/docker_images/solr.md Outdated Show resolved Hide resolved
docs/using_lagoon/docker_images/varnish.md Outdated Show resolved Hide resolved
vincenzodnp and others added 3 commits Oct 25, 2019
Fix typo

Co-Authored-By: Toby Bellwood <toby.bellwood@finance.gov.au>
…amazeeio/lagoon into 1021-document-lagoon-base-docker-images
@vincenzodnp vincenzodnp changed the title 1021 document lagoon base docker images #1021 document lagoon base docker images Oct 25, 2019
Copy link
Contributor Author

vincenzodnp left a comment

Go for a review ;)

@vincenzodnp vincenzodnp requested a review from tobybellwood Oct 25, 2019
Copy link
Contributor

tobybellwood left a comment

new redis image is redis-persistent (file named redis-permanent 😃)

Other than that, GTG for me

@Schnitzel Schnitzel merged commit 616adca into master Nov 2, 2019
1 check failed
1 check failed
continuous-integration/jenkins/pr-merge This commit cannot be built
Details
@Schnitzel

This comment has been minimized.

Copy link
Member

Schnitzel commented Nov 2, 2019

@vincenzodnp I merged this in, but they are not visible here: https://lagoon.readthedocs.io/en/latest/
looks like they are missing from here: https://github.com/amazeeio/lagoon/blob/master/mkdocs.yml
can you create another PR and add them there?

@vincenzodnp vincenzodnp self-assigned this Nov 5, 2019
@tobybellwood tobybellwood added this to the v1.2.0 milestone Dec 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.