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

Upgrade composer v1 to composer v2 for php 7.4 #108

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+6 −8
Open

Upgrade composer v1 to composer v2 for php 7.4 #108

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
385cf7a
Upgrade composer v1 to composer v2 for php 7.4
rsereir Nov 1, 2020
56aedd0
Remove hirak/prestissimo image from php with composer v2
rsereir Nov 3, 2020
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
2 changes: 2 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions php/7.4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ USER root
WORKDIR /tmp

# COPY INSTALL SCRIPTS
COPY --from=composer:1 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
COPY ./php/scripts/*.sh /tmp/
RUN chmod +x /tmp/*.sh

Expand All @@ -39,7 +39,6 @@ RUN bash ./packages.sh \
echo "PATH=$(yarn global bin):$PATH" >> /root/.bashrc && \
echo "$IMAGE_USER ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers && \
mkdir -p /var/www/html \
&& composer global require "hirak/prestissimo:^0.3" \
&& rm -rf ~/.composer/cache/* \
&& chown -R $IMAGE_USER:$IMAGE_USER /var/www $HOME \
&& curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh \
Expand Down
3 changes: 1 addition & 2 deletions php/7.4/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ENV PHP_VERSION=7.4
WORKDIR /tmp

COPY ./php/scripts/alpine/*.sh /tmp/
COPY --from=composer:1 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
COPY --from=mhart/alpine-node:12 /usr/bin/node /usr/bin/
COPY --from=mhart/alpine-node:12 /usr/lib/libgcc* /usr/lib/libstdc* /usr/lib/* /usr/lib/

Expand All @@ -39,7 +39,6 @@ RUN chmod +x /tmp/*.sh \
&& bash ./packages.sh \
&& bash ./extensions.sh \
&& bash ./nodeyarn.sh \
&& composer global require "hirak/prestissimo:^0.3" \
&& rm -rf ~/.composer/cache/* \
&& chown -R $IMAGE_USER:$IMAGE_USER /var/www $HOME \
&& echo "$IMAGE_USER ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers \
Expand Down
3 changes: 1 addition & 2 deletions php/7.4/alpine/Dockerfile-lts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ WORKDIR /tmp

# COPY INSTALL SCRIPTS
COPY ./php/scripts/alpine/*.sh /tmp/
COPY --from=composer:1 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
COPY --from=mhart/alpine-node:12.16.1 /usr/bin/node /usr/bin/
COPY --from=mhart/alpine-node:12.16.1 /usr/lib/libgcc* /usr/lib/libstdc* /usr/lib/* /usr/lib/

Expand All @@ -39,7 +39,6 @@ RUN chmod +x /tmp/*.sh \
&& bash ./packages.sh \
&& bash ./extensions.sh \
&& bash ./nodeyarn.sh \
&& composer global require "hirak/prestissimo:^0.3" \
&& rm -rf ~/.composer/cache/* \
&& chown -R $IMAGE_USER:$IMAGE_USER /var/www $HOME \
&& echo "$IMAGE_USER ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers \
Expand Down
3 changes: 1 addition & 2 deletions php/7.4/fpm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ USER root
WORKDIR /tmp

# COPY INSTALL SCRIPTS
COPY --from=composer:1 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
COPY ./php/scripts/*.sh /tmp/
RUN chmod +x /tmp/*.sh

Expand All @@ -38,7 +38,6 @@ RUN bash ./packages.sh \
echo "$IMAGE_USER ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers && \
mkdir -p /var/www/html && \
chown -R $IMAGE_USER:$IMAGE_USER /var/www $HOME \
&& composer global require "hirak/prestissimo:^0.3" \
&& rm -rf ~/.composer/cache/* \
&& chown -R $IMAGE_USER:$IMAGE_USER $COMPOSER_HOME \
&& curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh \
Expand Down