Skip to content

Commit cd37023

Browse files
Chore: cleanup dockerfile
1 parent b1a260a commit cd37023

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

.devcontainer/Dockerfile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ LABEL build.step.php=install_php
3535
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
3636
&& apt-get -y install --no-install-recommends \
3737
mariadb-client libicu-dev libzip-dev pkg-config libxml2-dev imagemagick \
38-
libgd-dev libfreetype-dev libpng-dev libjpeg62-turbo-dev ghostscript \
39-
&& docker-php-ext-install mysqli pdo pdo_mysql intl zip bcmath soap sockets exif
38+
libgd-dev libfreetype-dev libpng-dev libjpeg62-turbo-dev ghostscript
39+
4040
RUN docker-php-ext-configure gd --with-freetype --with-jpeg \
41-
&& docker-php-ext-install -j$(nproc) gd
41+
&& docker-php-ext-install -j$(nproc) gd mysqli pdo pdo_mysql intl zip bcmath soap sockets exif
4242
ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
4343
RUN install-php-extensions imagick solr @composer
4444

@@ -55,12 +55,7 @@ RUN sudo wget -O phive.phar "https://phar.io/releases/phive.phar" \
5555
&& sudo chmod +x phive.phar \
5656
&& sudo mv phive.phar /usr/local/bin/phive && phive version
5757

58-
LABEL build.step.sam=install_sam
59-
RUN curl -L "https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-arm64.zip" -o "awssam.zip" \
60-
&& unzip awssam.zip -d sam-install \
61-
&& sudo ./sam-install/install \
62-
&& rm awssam.zip && sam --version
63-
58+
LABEL build.step.delta=vscode_extensions
6459
# Store vscode extensions between builds
6560
ARG USERNAME=vscode
6661
RUN mkdir -p /home/$USERNAME/.vscode-server/extensions \

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"formulahendry.auto-rename-tag",
2626
"meganrogge.template-string-converter",
2727
"mikestead.dotenv",
28-
"ms-azuretools.vscode-docker",
28+
"ms-azuretools.vscode-containers",
2929
"mtxr.sqltools-driver-mysql",
3030
"mtxr.sqltools",
3131
"qcz.text-power-tools",

0 commit comments

Comments
 (0)