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 Docker images to v1.0.1 and remove XDebug custom config. #520

Merged
merged 6 commits into from
Sep 3, 2019
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
4 changes: 2 additions & 2 deletions .ahoy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,9 @@ entrypoint:
#;< DEMO
#; Location of the demo database used for demonstration only.
#; This will be removed during project install.
export DEMO_DB="${DEMO_DB:-https://gist.githubusercontent.com/alexdesignworks/838bea313c1d5f2c7c912693954f0619/raw/7aa622c72d91554d056ee56933b9cb570c765e8f/db_d8.dist.sql}"
export DEMO_DB="${DEMO_DB:-https://raw.githubusercontent.com/wiki/integratedexperts/drupal-dev/db_d8.dist.sql.md}"
#; Location of the demo database used for tests only.
export DEMO_DB_TEST="${DEMO_DB_TEST:-https://gist.githubusercontent.com/alexdesignworks/4387f56278be8597b5f27868d15e798f/raw/2bdfc4cfb28678caf5e9a73c44fe28b3eddc6316/db_d8.star_wars.sql}"
export DEMO_DB_TEST="${DEMO_DB_TEST:-https://raw.githubusercontent.com/wiki/integratedexperts/drupal-dev/db_d8.star_wars.sql.md}"
#;> DEMO
#;< FRESH_INSTALL
export DOCTOR_CHECK_DB=0
Expand Down
10 changes: 4 additions & 6 deletions .docker/Dockerfile.cli
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
# @see https://github.com/amazeeio/lagoon/tree/master/images/php/cli-drupal
FROM amazeeio/php:7.2-cli-drupal-v0.22.1
FROM amazeeio/php:7.2-cli-drupal-v1.0.1

ENV WEBROOT=docroot \
COMPOSER_ALLOW_SUPERUSER=1 \
COMPOSER_CACHE_DIR=/tmp/.composer/cache \
MYSQL_HOST=mariadb

# Enable Xdebug only if XDEBUG_ENABLE has a value.
# @see https://github.com/amazeeio/lagoon/issues/1170
COPY .docker/scripts/60-php-xdebug.sh /lagoon/entrypoints/60-php-xdebug.sh
COPY .docker/scripts/61-php-xdebug-cli-env.sh /lagoon/entrypoints/61-php-xdebug-cli-env.sh

RUN apk update \
&& apk add pv \
&& rm -rf /var/cache/apk/*

# @todo: Remove once https://github.com/amazeeio/lagoon/issues/1212 is fixed.
RUN apk upgrade nghttp2-libs

ENV DOCKERIZE_VERSION v0.6.1
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile.nginx-drupal
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
ARG CLI_IMAGE
FROM ${CLI_IMAGE:-cli} as cli

FROM amazeeio/nginx-drupal:v0.22.1
FROM amazeeio/nginx-drupal:v1.0.1

ENV WEBROOT=docroot

Expand Down
6 changes: 1 addition & 5 deletions .docker/Dockerfile.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
ARG CLI_IMAGE
FROM ${CLI_IMAGE:-cli} as cli

FROM amazeeio/php:7.2-fpm-v0.22.1

# Enable Xdebug only if XDEBUG_ENABLE has a value.
# @see https://github.com/amazeeio/lagoon/issues/1170
COPY .docker/scripts/60-php-xdebug.sh /lagoon/entrypoints/60-php-xdebug.sh
FROM amazeeio/php:7.2-fpm-v1.0.1

COPY --from=cli /app /app
2 changes: 1 addition & 1 deletion .docker/Dockerfile.solr
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
ARG CLI_IMAGE
FROM ${CLI_IMAGE} as cli

FROM amazeeio/solr:6.6-drupal-v0.22.1
FROM amazeeio/solr:6.6-drupal-v1.0.1
# Uncomment below after installing search_api_solr module (it must exist in the codebase).
# COPY --from=cli /app/docroot/modules/contrib/search_api_solr/solr-conf/6.x/ /solr-conf/conf/
Empty file added .docker/scripts/.gitkeep
Empty file.
46 changes: 0 additions & 46 deletions .docker/scripts/60-php-xdebug.sh

This file was deleted.

17 changes: 0 additions & 17 deletions .docker/scripts/61-php-xdebug-cli-env.sh

This file was deleted.

4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ services:
#;> LAGOON

mariadb:
image: amazeeio/mariadb-drupal:v0.22.1
image: amazeeio/mariadb-drupal:v1.0.1
environment:
<<: *default-environment
ports:
Expand All @@ -134,7 +134,7 @@ services:

#;< REDIS
redis:
image: amazeeio/redis:v0.22.1
image: amazeeio/redis:v1.0.1
#;< LAGOON
labels:
lagoon.type: redis
Expand Down
88 changes: 27 additions & 61 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"grunt-sass-globbing": "^1.5.1",
"grunt-sass-lint": "^0.2.4",
"gruntify-eslint": "5.0.0",
"node-sass": "^4.11.0",
"node-sass": "^4.12.0",
"sass-lint": "^1.12.1"
},
"scripts": {
Expand Down