Skip to content

Commit 10c30c2

Browse files
committed
Revert "refactor: install composer in userland"
This reverts commit 9de46ad.
1 parent 5d754fc commit 10c30c2

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ RUN install-php-extensions \
3030
zip \
3131
intl \
3232
&& \
33-
mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
33+
mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini" && \
34+
curl -sSL https://getcomposer.org/installer | php && \
35+
chmod +x composer.phar && \
36+
mv composer.phar /usr/local/bin/composer
3437

3538
RUN groupadd -g 1001 vscode && \
3639
useradd -s /bin/zsh -m -u 1001 -g vscode vscode && \
@@ -39,13 +42,7 @@ RUN groupadd -g 1001 vscode && \
3942

4043
USER vscode
4144

42-
RUN curl -sSL https://getcomposer.org/installer |\
43-
php -- \
44-
--no-ansi \
45-
--install-dir="${HOME}/bin" \
46-
--filename="composer" \
47-
&& \
48-
curl --proto '=https' --tlsv1.2 -LsSf https://starship.rs/install.sh | sh -s -- --yes && \
45+
RUN curl --proto '=https' --tlsv1.2 -LsSf https://starship.rs/install.sh | sh -s -- --yes && \
4946
curl --proto '=https' --tlsv1.2 -LsSf https://github.com/atuinsh/atuin/releases/latest/download/atuin-installer.sh | ATUIN_NO_MODIFY_PATH=1 sh && \
5047
mv ${HOME}/.atuin/bin/* "${HOME}/bin" && \
5148
rm -rf "${HOME}/.atuin" && \

0 commit comments

Comments
 (0)