diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9be5a40..b847dc5 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,7 +1,6 @@ -# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.0/containers/php/.devcontainer/base.Dockerfile - -# [Choice] PHP version: 8, 8.0, 7, 7.4, 7.3 -ARG VARIANT="7" +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.195.0/containers/php/.devcontainer/base.Dockerfile +# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8, 8.0, 7, 7.4, 7.3, 8-bullseye, 8.0-bullseye, 7-bullseye, 7.4-bullseye, 7.3-bullseye, 8-buster, 8.0-buster, 7-buster, 7.4-buster, 7.3-buster +ARG VARIANT=7-bullseye FROM mcr.microsoft.com/vscode/devcontainers/php:0-${VARIANT} # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index a148f23..9d91f9d 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,12 +1,14 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: -// https://github.com/microsoft/vscode-dev-containers/tree/v0.191.0/containers/php +// https://github.com/microsoft/vscode-dev-containers/tree/v0.195.0/containers/php { "name": "PHP", "build": { "dockerfile": "Dockerfile", "args": { // Update VARIANT to pick a PHP version: 8, 8.0, 7, 7.4, 7.3 - "VARIANT": "7", + // Append -bullseye or -buster to pin to an OS version. + // Use -bullseye variants on local on arm64/Apple Silicon. + "VARIANT": "7-bullseye", "NODE_VERSION": "lts/*" } },