Removed redundant php installs and added phpbrew use to /etc/environment (#122)

* Removed redundant php installs and added phpbrew use to /etc/environment

* Let's get some output, dammit

* fixed --stdout arg

Author: Justin Boswell

.github/docker-images/phpbrew-linux-x64/Dockerfile

@@ -75,16 +75,10 @@ RUN curl -L -O https://github.com/phpbrew/phpbrew/releases/latest/download/phpbr
     && mv phpbrew.phar /usr/local/bin/phpbrew \
     && phpbrew init \
     && phpbrew update --old \
-    && cat ~/.phpbrew/bashrc >> /etc/environment
+    && cat ~/.phpbrew/bashrc >> /etc/environment \
+    && echo "phpbrew use $PHP_VERSION" >> /etc/environment
 
-RUN phpbrew install -j 4 $PHP_VERSION +small -openssl as $PHP_VERSION
-RUN phpbrew install -j 4 5.6 +small -openssl as 5.6
-RUN phpbrew install -j 4 7.0 +small -openssl as 7.0
-RUN phpbrew install -j 4 7.1 +small -openssl as 7.1
-RUN phpbrew install -j 4 7.2 +small -openssl as 7.2
-RUN phpbrew install -j 4 7.3 +small -openssl as 7.3
-RUN phpbrew install -j 4 7.4 +small -openssl as 7.4
-RUN phpbrew install -j 4 8.0 +small -openssl as 8.0
+RUN phpbrew install --stdout -j 4 $PHP_VERSION +small -openssl as $PHP_VERSION
 
 ###############################################################################
 # Install entrypoint

.github/workflows/create-channel.yml

@@ -104,4 +104,4 @@ jobs:
         docker push docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.variant }}:$IMAGE_TAG
         docker save docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.variant }}:$IMAGE_TAG \
         | gzip \
-        | aws s3 cp --no-progress - s3://${{env.AWS_S3_BUCKET}}/channels/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz
+        | aws s3 cp - s3://${{env.AWS_S3_BUCKET}}/channels/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz

.github/workflows/create-release.yml

@@ -118,8 +118,8 @@ jobs:
         export IMAGE_TAG=${{ steps.tag.outputs.release_tag }}
         docker save docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.variant }}:$IMAGE_TAG \
         | gzip \
-        | aws s3 cp --no-progress - s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz
-        aws s3 cp --no-progress s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz s3://${{env.AWS_S3_BUCKET}}/LATEST/aws-crt-${{ matrix.variant }}.tar.gz
+        | aws s3 cp - s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz
+        aws s3 cp s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz s3://${{env.AWS_S3_BUCKET}}/LATEST/aws-crt-${{ matrix.variant }}.tar.gz
 
   export-php-images:
     name: Release aws-crt-php${{ matrix.version }}-linux-x64
@@ -183,5 +183,5 @@ jobs:
         export IMAGE_TAG=${{ steps.tag.outputs.release_tag }}
         docker save docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-php${{ matrix.version }}-linux-x64:$IMAGE_TAG \
         | gzip \
-        | aws s3 cp --no-progress - s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-php${{ matrix.version }}-linux-x64.tar.gz
-        aws s3 cp --no-progress s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-php${{ matrix.version }}-linux-x64.tar.gz s3://${{env.AWS_S3_BUCKET}}/LATEST/aws-crt-php${{ matrix.version }}-linux-x64.tar.gz
+        | aws s3 cp - s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-php${{ matrix.version }}-linux-x64.tar.gz
+        aws s3 cp s3://${{env.AWS_S3_BUCKET}}/releases/$IMAGE_TAG/aws-crt-php${{ matrix.version }}-linux-x64.tar.gz s3://${{env.AWS_S3_BUCKET}}/LATEST/aws-crt-php${{ matrix.version }}-linux-x64.tar.gz

.github/workflows/docker-images.yml

@@ -71,7 +71,7 @@ jobs:
       run: |
         export IMAGE_TAG=${{ steps.tag.outputs.release_tag }}
         docker save docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-${{ matrix.variant }}:$IMAGE_TAG |\
-          aws s3 cp --no-progress - s3://${{env.AWS_S3_BUCKET}}/channels/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz
+          aws s3 cp - s3://${{env.AWS_S3_BUCKET}}/channels/$IMAGE_TAG/aws-crt-${{ matrix.variant }}.tar.gz
 
   php-images:
     name: PHP ${{ matrix.version }}
@@ -116,7 +116,7 @@ jobs:
         export IMAGE_TAG=${{ steps.tag.outputs.release_tag }}
         docker save docker.pkg.github.com/awslabs/aws-crt-builder/aws-crt-php${{ matrix.version }}-linux-x64:$IMAGE_TAG \
           | gzip \
-          | aws s3 cp --no-progress - s3://${{env.AWS_S3_BUCKET}}/channels/$IMAGE_TAG/aws-crt-php${{ matrix.version }}-linux-x64.tar.gz
+          | aws s3 cp - s3://${{env.AWS_S3_BUCKET}}/channels/$IMAGE_TAG/aws-crt-php${{ matrix.version }}-linux-x64.tar.gz
 
   ###############################################################################
   # DOWNSTREAM TESTS