Skip to content

Commit

Permalink
Dropped mg2-codegen (#222)
Browse files Browse the repository at this point in the history
  • Loading branch information
lmakarov committed May 14, 2021
1 parent 75b5fb6 commit 78af92f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 22 deletions.
5 changes: 0 additions & 5 deletions 7.3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ SHELL ["/bin/bash", "-c"]
# PHP tools (installed as user)
# Note: DRUSH_BACKDROP_VERSION should be pinned at 1.2.0 as 1.3.0 introduces changes that break regular drush 8.
ENV \
MG_CODEGEN_VERSION=1.11.2 \
DRUSH_BACKDROP_VERSION=1.2.0
# Don't use -x here, as the output may be excessive
RUN set -e; \
Expand All @@ -345,10 +344,6 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
# Install cgr to use it in-place of `composer global require` for misc globally installed cli tools.
# See https://pantheon.io/blog/fixing-composer-global-command
composer global require consolidation/cgr >/dev/null; \
# Magento2 Code Generator
# Cannot be properly installed and used as a phar binary
# See https://github.com/staempfli/magento2-code-generator/issues/11
cgr staempfli/magento2-code-generator:${MG_CODEGEN_VERSION} >/dev/null; \
# Cleanup
composer clear-cache; \
\
Expand Down
5 changes: 0 additions & 5 deletions 7.4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ SHELL ["/bin/bash", "-c"]
# PHP tools (installed as user)
# Note: DRUSH_BACKDROP_VERSION should be pinned at 1.2.0 as 1.3.0 introduces changes that break regular drush 8.
ENV \
MG_CODEGEN_VERSION=1.11.2 \
DRUSH_BACKDROP_VERSION=1.2.0
# Don't use -x here, as the output may be excessive
RUN set -e; \
Expand All @@ -345,10 +344,6 @@ $HOME/.composer/vendor/phpcompatibility/phpcompatibility-paragonie/PHPCompatibil
# Install cgr to use it in-place of `composer global require` for misc globally installed cli tools.
# See https://pantheon.io/blog/fixing-composer-global-command
composer global require consolidation/cgr >/dev/null; \
# Magento2 Code Generator
# Cannot be properly installed and used as a phar binary
# See https://github.com/staempfli/magento2-code-generator/issues/11
cgr staempfli/magento2-code-generator:${MG_CODEGEN_VERSION} >/dev/null; \
# Cleanup
composer clear-cache; \
\
Expand Down
5 changes: 1 addition & 4 deletions 8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@ ENV COMPOSER_DEFAULT_VERSION=2 \
TERMINUS_VERSION=2.4.1 \
JQ_VERSION=1.6 \
YQ_VERSION=3.4.1 \
MG_CODEGEN_VERSION=1.11.2
RUN set -xe; \
# Composer 1.x
curl -fsSL "https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar" -o /usr/local/bin/composer1; \
Expand Down Expand Up @@ -290,12 +289,10 @@ RUN set -xe; \
fi; \
# yq
curl -fsSL "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_${TARGETARCH}" -o /usr/local/bin/yq; \
# mg2-codegen
curl -fsSL "https://github.com/staempfli/magento2-code-generator/releases/download/${MG_CODEGEN_VERSION}/mg2-codegen.phar" -o /usr/local/bin/mg2-codegen; \
# Set Default Composer Version
ln -s /usr/local/bin/composer${COMPOSER_DEFAULT_VERSION} /usr/local/bin/composer; \
# Make all downloaded binaries executable in one shot
(cd /usr/local/bin && chmod +x composer1 composer2 drush8 drush drupal wp blackfire platform acli terminus yq mg2-codegen);
(cd /usr/local/bin && chmod +x composer1 composer2 drush8 drush drupal wp blackfire platform acli terminus yq);

# Install Python3 from Debian repos
# This adds about 30MB to uncompressed image size.
Expand Down
8 changes: 0 additions & 8 deletions tests/test.bats
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,6 @@ _healthcheck_wait ()
[[ ${status} == 0 ]]
unset output

# Check Magento 2 Code Generator version
# TODO: this needs to be replaced with the actual version check
# See https://github.com/staempfli/magento2-code-generator/issues/15
#run docker exec -u docker "$NAME" bash -lc 'mg2-codegen --version | grep "^mg2-codegen ${MG_CODEGEN_VERSION}$"'
run docker exec -u docker "$NAME" bash -lc 'set -x; mg2-codegen --version | grep "^mg2-codegen @git-version@$"'
[[ ${status} == 0 ]]
unset output

# Check Terminus version
run docker exec -u docker "$NAME" bash -lc 'set -x; terminus --version | grep "^Terminus ${TERMINUS_VERSION}$"'
[[ ${status} == 0 ]]
Expand Down

0 comments on commit 78af92f

Please sign in to comment.