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

Updated images to be compatible with Apple chip. #230

Merged
merged 3 commits into from
Nov 22, 2021

Conversation

AlexSkrypnyk
Copy link
Contributor

@AlexSkrypnyk AlexSkrypnyk commented Nov 22, 2021

AIO has already published images with multi-architecture support, but they published them in uselagoon DockerHub namespace (they usually double-publish them in amazeeio and uselagoon namespaces; amazeeio is deprecated now).

Changed

  1. Switched images to uselagoon namespace and update to the latest version.
  2. Updated Solr image to Solr 7 (there is no Solr 6 image available.) We should be using the latest Solr image anyway.
  3. Fixed check for existence of the custom scripts (due to an upstream bug in Alpine bash under alpine:edge failed in testing file writable alpinelinux/docker-alpine#156).

How to test

  1. Checkout this branch
  2. ahoy build

https://nginx-php.pr-230.civic.au2.amazee.io/

@AlexSkrypnyk AlexSkrypnyk self-assigned this Nov 22, 2021
@AlexSkrypnyk AlexSkrypnyk added State: DO NOT MERGE Do not merge this pull request State: Do not review Do not review this pull request labels Nov 22, 2021
@AlexSkrypnyk AlexSkrypnyk added State: Needs review Pull requests needs a review from assigned developers and removed State: DO NOT MERGE Do not merge this pull request State: Do not review Do not review this pull request labels Nov 22, 2021
@@ -190,7 +190,7 @@ fi
# "drupal-install-site-" prefix and ".sh" extension.
if [ -d "${APP}/scripts/custom" ]; then
for file in "${APP}"/scripts/custom/drupal-install-site-*.sh; do
if [ -r "${file}" ]; then
if [ -f "${file}" ]; then
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

upstream bug in Alpine (alpinelinux/docker-alpine#156) - but we do not need -r - -f is enough to check if file exists.

This change is added to DrevOps

@AlexSkrypnyk AlexSkrypnyk merged commit c757c4d into develop Nov 22, 2021
@AlexSkrypnyk AlexSkrypnyk deleted the feature/images-update branch November 22, 2021 06:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
State: Needs review Pull requests needs a review from assigned developers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant