Merge

Author: erichomanchuk

Dockerfile

@@ -1,45 +1,80 @@
-FROM node:8.15 AS node
+# Build the node image and store the build as node. We need to name it because
+# when we call FROM again it will clear out the previous build.
+FROM node:14.17 AS node
 
+# Install gulp globally
 RUN npm install -g gulp-cli
 
-FROM php:7.2-cli
+# Build stage using php image.
+FROM php:7.4-cli
 
-RUN apt-get update && apt-get install -y curl git rsync subversion openssl zip unzip zlib1g-dev libpng-dev \
-  && echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \
+# Install some needed packages then after install remove the cache files of
+# apt-get to save space.
+RUN apt-get update && apt-get install -y \
+  git \
+  libpng-dev \
+  rsync \
+  unzip \
+  zip \
+  zlib1g-dev \
+  libzip-dev \
   && rm -rf /var/lib/apt/lists/*
 
+# Create seperate config.ini files for overriding the php settings to set the
+# php memory limit to no limit (needed for composer) and set the timezone to 
+# UTC if the PHP_TIMEZONE environment variable is undefined.
+#
+# This avoids having to have a php.ini file and will just use the defaults set
+# in php.
 RUN echo "memory_limit=-1" > "$PHP_INI_DIR/conf.d/memory-limit.ini" \
  && echo "date.timezone=${PHP_TIMEZONE:-UTC}" > "$PHP_INI_DIR/conf.d/date_timezone.ini"
 
+# Install some needed php extensions (for composer?).
 RUN docker-php-ext-install zip gd
 
+# Copy node.js from the node stage into the current stage as well will run our
+# builds in this stage.
 COPY --from=node /usr/local/bin/node /usr/local/bin/node
 
-ENV YARN_VERSION 1.12.3
+# Set the yarn version environment version from the node stage. Yarn comes with
+# the node image by default so no reason to download it.
+ENV YARN_VERSION 1.22.5
 
+# Copy yarn from the node stage to this stage.
 COPY --from=node /opt/yarn-v$YARN_VERSION /opt/yarn
 
+# Copy the node modules from the node stage to this stage.
 COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
 
+# Symlink all of the needed node apps into our user bin so they can be 
+# executable and update the apps permissions.
 RUN cd /usr/local/bin; \
-    ln -sf ../lib/node_modules/npm/bin/npm-cli.js npm; \
-    ln -sf ../lib/node_modules/gulp-cli/bin/gulp.js gulp; \
-    ln -sf /opt/yarn/bin/yarn yarn; \
-    chmod +x npm; \
-    chmod +x yarn; \
-    chmod +x gulp
+  ln -sf ../lib/node_modules/npm/bin/npm-cli.js npm; \
+  ln -sf ../lib/node_modules/gulp-cli/bin/gulp.js gulp; \
+  ln -sf /opt/yarn/bin/yarn yarn; \
+  chmod +x npm; \
+  chmod +x yarn; \
+  chmod +x gulp
 
+# Set some environment variables for composer and drush.
 ENV COMPOSER_ALLOW_SUPERUSER 1
-ENV DRUSH_VERSION 8.1.15
+ENV DRUSH_VERSION 10.4.3
 ENV TERMINUS_PLUGINS_DIR /usr/local/share/terminus-plugins
 
+# Copy our scripts folder into the tmp folder of this container.
 COPY scripts /tmp/scripts/
 
+<<<<<<< HEAD
 RUN curl -sS https://getcomposer.org/installer | php -- --version=1.10.22 \
+=======
+# Install composer and add it's vendor bin folder to the exports path in the
+# bash file so we can execute the apps from cmd line.
+RUN curl -sS https://getcomposer.org/installer | php -- --version=2.1.3 \
+>>>>>>> 9.x
     && mv composer.phar /usr/local/bin/composer \
     && echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile
 
-
-# RUN php /tmp/scripts/composer-setup --install-dir=/usr/local/bin --filename=composer; rm -f /tmp/setup
+# Run the drush setup script that will install drush.
 RUN /tmp/scripts/drush-setup
+# Run the terminus plugins setup script.
 RUN /tmp/scripts/terminus-plugins-setup

scripts/drush-setup

@@ -1,4 +1,9 @@
 #!/bin/sh
 
-curl -L https://github.com/drush-ops/drush/releases/download/${DRUSH_VERSION}/drush.phar -o /usr/local/bin/drush
+mkdir -p /usr/local/share/drush
+/usr/bin/env composer -n --working-dir=/usr/local/share/drush require drush/drush:${DRUSH_VERSION}
+ln -fs /usr/local/share/drush/vendor/drush/drush/drush /usr/local/bin/drush
 chmod +x /usr/local/bin/drush
+
+# curl -L https://github.com/drush-ops/drush/releases/download/${DRUSH_VERSION}/drush.phar -o /usr/local/bin/drush
+# chmod +x /usr/local/bin/drush

scripts/terminus-plugins-setup

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 COMPOSER_BIN_DIR=/usr/local/bin composer -n global require -n "hirak/prestissimo:^0.3"
+<<<<<<< HEAD
 # Explicitly require symfony/process:^3 as a workaround until
 # https://github.com/pantheon-systems/terminus/issues/1808 is available
 # in a tagged release.
@@ -14,3 +15,15 @@ composer -n create-project -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-qu
 composer -n create-project -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-composer-plugin:^1
 composer -n create-project -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-drupal-console-plugin:^1
 composer -n create-project -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-mass-update:^1
+=======
+COMPOSER_BIN_DIR=/usr/local/bin composer -n --working-dir=/usr/local/share require pantheon-systems/terminus "^2.4"
+
+mkdir -p $TERMINUS_PLUGINS_DIR
+composer -n create-project --no-dev -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-build-tools-plugin:2.0.4
+composer -n create-project --no-dev -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-secrets-plugin:^1.3
+composer -n create-project --no-dev -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-rsync-plugin:^1.1
+composer -n create-project --no-dev -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-quicksilver-plugin:^1.3
+composer -n create-project --no-dev -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-composer-plugin:^1.1
+composer -n create-project --no-dev -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-drupal-console-plugin:^1.1
+composer -n create-project --no-dev -d $TERMINUS_PLUGINS_DIR pantheon-systems/terminus-mass-update:^1.1
+>>>>>>> 9.x