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.

Sign up for GitHub

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

Jump to bottom

Use drush launcher and drush8 in container, fixes #1488 #1638

Merged
merged 2 commits into from Jun 4, 2019
Merged

Use drush launcher and drush8 in container, fixes #1488 #1638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43a97fb
Use drush launcher and drush8 in container, fixes #1488
rfay Jun 3, 2019
62c23e8
Fix TestDdevExec
rfay Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions containers/ddev-webserver/Dockerfile
View file
Open in desktop
Expand Up @@ -4,7 +4,9 @@ ENV PHP_VERSIONS="php5.6 php7.0 php7.1 php7.2 php7.3"
ENV PHP_DEFAULT_VERSION="7.2"
ENV PHP_INI=/etc/php/$PHP_DEFAULT_VERSION/fpm/php.ini

ENV DRUSH_VERSION=8.1.18
ENV DRUSH_VERSION=8.2.3
ENV DRUSH_LAUNCHER_VERSION=0.6.0
ENV DRUSH_LAUNCHER_FALLBACK=/usr/local/bin/drush8
ENV WP_CLI_VERSION=2.1.0
ENV MAILHOG_VERSION=1.0.0
ENV BACKDROP_DRUSH_VERSION=0.1.0
Expand Down Expand Up @@ -97,8 +99,8 @@ RUN setcap CAP_NET_BIND_SERVICE=+eip /usr/sbin/apache2
ADD files /

RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
RUN composer global require consolidation/cgr
RUN /home/.composer/vendor/bin/cgr drush/drush:$DRUSH_VERSION && ln -s /home/.composer/vendor/bin/drush /usr/local/bin/drush
RUN curl -sSL "https://github.com/drush-ops/drush/releases/download/${DRUSH_VERSION}/drush.phar" -o /usr/local/bin/drush8 && chmod +x /usr/local/bin/drush8
RUN curl -sSL "https://github.com/drush-ops/drush-launcher/releases/download/${DRUSH_LAUNCHER_VERSION}/drush.phar" -o /usr/local/bin/drush && chmod +x /usr/local/bin/drush
RUN curl -sSL "https://github.com/mailhog/MailHog/releases/download/v${MAILHOG_VERSION}/MailHog_linux_amd64" -o /usr/local/bin/mailhog
RUN curl -sSL "https://github.com/wp-cli/wp-cli/releases/download/v${WP_CLI_VERSION}/wp-cli-${WP_CLI_VERSION}.phar" -o /usr/local/bin/wp-cli

Expand Down
2 changes: 1 addition & 1 deletion pkg/ddevapp/ddevapp_test.go
View file
Open in desktop
Expand Up @@ -1368,7 +1368,7 @@ func TestDdevExec(t *testing.T) {
Cmd: "drush status",
})
assert.NoError(err)
assert.Regexp("PHP configuration[ :]*/etc/php/[0-9].[0-9]/fpm/php.ini", out)
assert.Regexp("PHP configuration[ :]*/etc/php/[0-9].[0-9]/cli/php.ini", out)
case ddevapp.AppTypeWordPress:
out, _, err = app.Exec(&ddevapp.ExecOpts{
Service: "web",
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ var DockerComposeFileFormatVersion = "3.6"
var WebImg = "drud/ddev-webserver"

// WebTag defines the default web image tag for drud dev
var WebTag = "secure-DDEV_URL" // Note that this can be overridden by make
var WebTag = "20190603_drush_launcher" // Note that this can be overridden by make

// DBImg defines the default db image used for applications.
var DBImg = "drud/ddev-dbserver"
Expand Down