Skip to content
Open
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
3 changes: 3 additions & 0 deletions 7/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@ ENV DRUSH_VERSION 7.3.0
# Install Drush using Composer.
RUN composer global require drush/drush:"$DRUSH_VERSION" --prefer-dist

# Include bin path
ENV PATH="/tmp/vendor/bin:${PATH}"

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

This is a good change.... Should it also appear in the other base images too?


# Display which version of Drush was installed
RUN drush --version
11 changes: 5 additions & 6 deletions 9/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
FROM drush/drush:base-alpine
MAINTAINER Rob Loach <robloach@gmail.com>

# Set the Drush version.
ENV DRUSH_VERSION 9.2.1

# Install Drush using Composer.
RUN composer global require drush/drush:"$DRUSH_VERSION" --prefer-dist
# Install Drush launcher
RUN wget -O drush.phar https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar && \
chmod +x drush.phar && \
mv drush.phar /usr/local/bin/drush

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Drush installer instead of Composer for Drush 9?


# Display which version of Drush was installed.
RUN drush --version
RUN drush --drush-launcher-version
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ version:
docker run drush/drush:7 --version
docker run drush/drush:backdrop --version
docker run drush/drush:alpine --version
docker run drush/drush:9-alpine --version
docker run drush/drush:9-alpine --drush-launcher-version
docker run drush/drush:8-alpine --version
docker run drush/drush:7-alpine --version
docker run drush/drush:backdrop-alpine --version
Expand Down
2 changes: 1 addition & 1 deletion base/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Drush Docker Container
FROM composer/composer:alpine
FROM composer

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Seems like a good change, assuming alpine is used in composer.

MAINTAINER Moses Liao <moses.liao.sd@gmail.com>

# Add common extensions
Expand Down