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

Remove pinned versions to update to latest versions of modules #128

Merged
merged 7 commits into from
Oct 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions cypress/e2e/basic-starter.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,8 @@ describe('Taxonomy term page', () => {
it('should render places for Office (place type)', () => {
cy.visit('/place_type/office');
cy.get('h1').should('contain.text', 'Office');
cy.get('h2', { timeout: 8000 }).should('be.visible');
cy.get('article')
.should('have.length.greaterThan', 1)
.find('h2')
.should(($h2) => {
expect($h2.first()).to.contain('Boston Head Office');
});
cy.get('article').should('have.length.greaterThan', 1);
cy.get('article h2').should('contain.text', 'Boston Head Office');
cy.get('article').find('.media__content').should('exist');
});
});
Expand Down
8 changes: 4 additions & 4 deletions drupal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ ENV COMPOSER_HOME=/tmp/.composer

# Don't install Composer dependencies yet; we need to make a few
# adjustments first.
RUN composer create-project --no-install acquia/drupal-recommended-project /opt/drupal
RUN composer create-project --no-install acquia/drupal-recommended-project /opt/drupal --no-cache

WORKDIR /opt/drupal
COPY import-db settings.php.cat /opt/drupal

# The drupal:9-apache base container uses `web` as its document root.
RUN sed -i -e 's!docroot!web!g' composer.json

# Require specific constraints for certain dependencies to prevent
# Composer from installing known broken versions.
RUN composer require drupal/acquia_cms_common:^1.4 drupal/acquia_cms_starter drupal/acquia_cms_article:^1.3.5 drupal/acquia_cms_event:^1.3.5 drupal/acquia_cms_place:^1.3.5 drupal/acquia_cms_person:^1.3.5 drupal/acquia_cms_page:^1.3.5 drupal/address:^1.11
# This can be also used for requiring specific constraints for dependencies that
# have incompatible releases.
RUN composer require drupal/acquia_cms_starter

# Allow the caller to specify MySQL connection information. This will be
# written to settings.php, but can overridden at runtime by providing a
Expand Down
4 changes: 2 additions & 2 deletions drupal/verify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Starts the Acquia CMS site in an ephemeral container and confirms that it's
# serving JSON:API data.
#
docker run --detach --publish 8080:80 --name drupal --rm phenaproxima/acquia_cms:headless
docker run --detach --publish 8888:80 --name drupal --rm phenaproxima/acquia_cms:headless
# Give the container time to start Apache.
sleep 2
curl --fail --silent http://127.0.0.1:8080/jsonapi
curl --fail --silent http://127.0.0.1:8888/jsonapi
docker stop drupal