From fba08cc583495249f31991c55d0c8083b11bdd31 Mon Sep 17 00:00:00 2001 From: "ondrej@mirtes.cz" Date: Sun, 25 Oct 2026 19:35:04 +0000 Subject: [PATCH] Remove .devcontainer Amp-Thread-ID: https://ampcode.com/threads/T-01a17489-2226-749f-a34c-3c598abcf75d Co-authored-by: Amp --- .devcontainer/Dockerfile | 13 -- .devcontainer/devcontainer.json | 27 --- .devcontainer/library-scripts/README.md | 5 - .../library-scripts/common-debian.sh | 195 ------------------ .devcontainer/library-scripts/node-debian.sh | 105 ---------- 5 files changed, 345 deletions(-) delete mode 100644 .devcontainer/Dockerfile delete mode 100644 .devcontainer/devcontainer.json delete mode 100644 .devcontainer/library-scripts/README.md delete mode 100755 .devcontainer/library-scripts/common-debian.sh delete mode 100644 .devcontainer/library-scripts/node-debian.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile deleted file mode 100644 index 2f6f88d0df0..00000000000 --- a/.devcontainer/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM mcr.microsoft.com/vscode/devcontainers/php:8.1 - -# [Optional] Uncomment this section to install additional OS packages. -# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ -# && apt-get -y install --no-install-recommends - -# [Optional] Uncomment this line to install global node packages. -# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g " 2>&1 - -# PHP memory limit -RUN echo "memory_limit=768M" > /usr/local/etc/php/php.ini - -COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json deleted file mode 100644 index ff13dd64a38..00000000000 --- a/.devcontainer/devcontainer.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "PHP", - "build": { - "dockerfile": "Dockerfile" - }, - - // Set *default* container specific settings.json values on container create. - "settings": { - "terminal.integrated.shell.linux": "/bin/bash" - }, - - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "felixfbecker.php-debug", - "felixfbecker.php-intellisense", - "mrmlnc.vscode-apache" - ], - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - "forwardPorts": [8080], - - // Use 'postCreateCommand' to run commands after the container is created. - "postCreateCommand": "composer install" - - // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. - // "remoteUser": "vscode" -} diff --git a/.devcontainer/library-scripts/README.md b/.devcontainer/library-scripts/README.md deleted file mode 100644 index d06dfd1a95e..00000000000 --- a/.devcontainer/library-scripts/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Warning: Folder contents may be replaced - -The contents of this folder will be automatically replaced with a file of the same name in the [vscode-dev-containers](https://github.com/microsoft/vscode-dev-containers) repository's [script-library folder](https://github.com/microsoft/vscode-dev-containers/tree/master/script-library) whenever the repository is packaged. - -To retain your edits, move the file to a different location. You may also delete the files if they are not needed. \ No newline at end of file diff --git a/.devcontainer/library-scripts/common-debian.sh b/.devcontainer/library-scripts/common-debian.sh deleted file mode 100755 index 20a9216af7b..00000000000 --- a/.devcontainer/library-scripts/common-debian.sh +++ /dev/null @@ -1,195 +0,0 @@ -#!/usr/bin/env bash -#------------------------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. -#------------------------------------------------------------------------------------------------------------- - -# Syntax: ./common-debian.sh [install zsh flag] [username] [user UID] [user GID] [upgrade packages flag] - -INSTALL_ZSH=${1:-"true"} -USERNAME=${2:-"vscode"} -USER_UID=${3:-1000} -USER_GID=${4:-1000} -UPGRADE_PACKAGES=${5:-"true"} - -set -e - -if [ "$(id -u)" -ne 0 ]; then - echo -e 'Script must be run a root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.' - exit 1 -fi - -# Treat a user name of "none" as root -if [ "${USERNAME}" = "none" ] || [ "${USERNAME}" = "root" ]; then - USERNAME=root - USER_UID=0 - USER_GID=0 -fi - -# Load markers to see which steps have already run -MARKER_FILE="/usr/local/etc/vscode-dev-containers/common" -if [ -f "${MARKER_FILE}" ]; then - echo "Marker file found:" - cat "${MARKER_FILE}" - source "${MARKER_FILE}" -fi - -# Ensure apt is in non-interactive to avoid prompts -export DEBIAN_FRONTEND=noninteractive - -# Function to call apt-get if needed -apt-get-update-if-needed() -{ - if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then - echo "Running apt-get update..." - apt-get update - else - echo "Skipping apt-get update." - fi -} - -# Run install apt-utils to avoid debconf warning then verify presence of other common developer tools and dependencies -if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then - apt-get-update-if-needed - - PACKAGE_LIST="apt-utils \ - git \ - openssh-client \ - gnupg2 \ - iproute2 \ - procps \ - lsof \ - htop \ - net-tools \ - psmisc \ - curl \ - wget \ - rsync \ - ca-certificates \ - unzip \ - zip \ - nano \ - vim-tiny \ - less \ - jq \ - lsb-release \ - apt-transport-https \ - dialog \ - libc6 \ - libgcc1 \ - libgssapi-krb5-2 \ - libicu[0-9][0-9] \ - liblttng-ust0 \ - libstdc++6 \ - zlib1g \ - locales \ - sudo \ - ncdu \ - man-db" - - # Install libssl1.1 if available - if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then - PACKAGE_LIST="${PACKAGE_LIST} libssl1.1" - fi - - # Install appropriate version of libssl1.0.x if available - LIBSSL=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '') - if [ "$(echo "$LIBSSL" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then - if [[ ! -z $(apt-cache --names-only search ^libssl1.0.2$) ]]; then - # Debian 9 - PACKAGE_LIST="${PACKAGE_LIST} libssl1.0.2" - elif [[ ! -z $(apt-cache --names-only search ^libssl1.0.0$) ]]; then - # Ubuntu 18.04, 16.04, earlier - PACKAGE_LIST="${PACKAGE_LIST} libssl1.0.0" - fi - fi - - echo "Packages to verify are installed: ${PACKAGE_LIST}" - apt-get -y install --no-install-recommends ${PACKAGE_LIST} 2> >( grep -v 'debconf: delaying package configuration, since apt-utils is not installed' >&2 ) - - PACKAGES_ALREADY_INSTALLED="true" -fi - -# Get to latest versions of all packages -if [ "${UPGRADE_PACKAGES}" = "true" ]; then - apt-get-update-if-needed - apt-get -y upgrade --no-install-recommends - apt-get autoremove -y -fi - -# Ensure at least the en_US.UTF-8 UTF-8 locale is available. -# Common need for both applications and things like the agnoster ZSH theme. -if [ "${LOCALE_ALREADY_SET}" != "true" ]; then - echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen - locale-gen - LOCALE_ALREADY_SET="true" -fi - -# Create or update a non-root user to match UID/GID - see https://aka.ms/vscode-remote/containers/non-root-user. -if id -u $USERNAME > /dev/null 2>&1; then - # User exists, update if needed - if [ "$USER_GID" != "$(id -G $USERNAME)" ]; then - groupmod --gid $USER_GID $USERNAME - usermod --gid $USER_GID $USERNAME - fi - if [ "$USER_UID" != "$(id -u $USERNAME)" ]; then - usermod --uid $USER_UID $USERNAME - fi -else - # Create user - groupadd --gid $USER_GID $USERNAME - useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME -fi - -# Add add sudo support for non-root user -if [ "${USERNAME}" != "root" ] && [ "${EXISTING_NON_ROOT_USER}" != "${USERNAME}" ]; then - echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME - chmod 0440 /etc/sudoers.d/$USERNAME - EXISTING_NON_ROOT_USER="${USERNAME}" -fi - -# .bashrc/.zshrc snippet -RC_SNIPPET="$(cat << EOF -export USER=\$(whoami) - -export PATH=\$PATH:\$HOME/.local/bin - -if type code-insiders > /dev/null 2>&1 && ! type code > /dev/null 2>&1; then - alias code=code-insiders -fi -EOF -)" - -# Ensure ~/.local/bin is in the PATH for root and non-root users for bash. (zsh is later) -if [ "${RC_SNIPPET_ALREADY_ADDED}" != "true" ]; then - echo "${RC_SNIPPET}" >> /etc/bash.bashrc - RC_SNIPPET_ALREADY_ADDED="true" -fi - -# Optionally install and configure zsh -if [ "${INSTALL_ZSH}" = "true" ] && [ ! -d "/root/.oh-my-zsh" ] && [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then - apt-get-update-if-needed - apt-get install -y zsh - curl -fsSLo- https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh | bash 2>&1 - echo "${RC_SNIPPET}" >> /etc/zsh/zshrc - echo -e "DEFAULT_USER=\$USER\nprompt_context(){}" >> /root/.zshrc - cp -fR /root/.oh-my-zsh /etc/skel - cp -f /root/.zshrc /etc/skel - sed -i -e "s/\/root\/.oh-my-zsh/\/home\/\$(whoami)\/.oh-my-zsh/g" /etc/skel/.zshrc - if [ "${USERNAME}" != "root" ]; then - cp -fR /etc/skel/.oh-my-zsh /etc/skel/.zshrc /home/$USERNAME - chown -R $USER_UID:$USER_GID /home/$USERNAME/.oh-my-zsh /home/$USERNAME/.zshrc - fi - ZSH_ALREADY_INSTALLED="true" -fi - -# Write marker file -mkdir -p "$(dirname "${MARKER_FILE}")" -echo -e "\ - PACKAGES_ALREADY_INSTALLED=${PACKAGES_ALREADY_INSTALLED}\n\ - LOCALE_ALREADY_SET=${LOCALE_ALREADY_SET}\n\ - EXISTING_NON_ROOT_USER=${EXISTING_NON_ROOT_USER}\n\ - RC_SNIPPET_ALREADY_ADDED=${RC_SNIPPET_ALREADY_ADDED}\n\ - ZSH_ALREADY_INSTALLED=${ZSH_ALREADY_INSTALLED}" > "${MARKER_FILE}" - -echo "Done!" \ No newline at end of file diff --git a/.devcontainer/library-scripts/node-debian.sh b/.devcontainer/library-scripts/node-debian.sh deleted file mode 100644 index d230a14e821..00000000000 --- a/.devcontainer/library-scripts/node-debian.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -#------------------------------------------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. -#------------------------------------------------------------------------------------------------------------- - -# Syntax: ./node-debian.sh [directory to install nvm] [node version to install (use "none" to skip)] [non-root user] - -export NVM_DIR=${1:-"/usr/local/share/nvm"} -export NODE_VERSION=${2:-"lts/*"} -USERNAME=${3:-"vscode"} -UPDATE_RC=${4:-"true"} - -set -e - -if [ "$(id -u)" -ne 0 ]; then - echo -e 'Script must be run a root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.' - exit 1 -fi - -# Treat a user name of "none" or non-existent user as root -if [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then - USERNAME=root -fi - -if [ "${NODE_VERSION}" = "none" ]; then - export NODE_VERSION= -fi - -# Ensure apt is in non-interactive to avoid prompts -export DEBIAN_FRONTEND=noninteractive - -# Install curl, apt-transport-https, tar, or gpg if missing -if ! dpkg -s apt-transport-https curl ca-certificates tar > /dev/null 2>&1 || ! type gpg > /dev/null 2>&1; then - if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then - apt-get update - fi - apt-get -y install --no-install-recommends apt-transport-https curl ca-certificates tar gnupg2 -fi - -# Install yarn -if type yarn > /dev/null 2>&1; then - echo "Yarn already installed." -else - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | (OUT=$(apt-key add - 2>&1) || echo $OUT) - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list - apt-get update - apt-get -y install --no-install-recommends yarn -fi - -# Install the specified node version if NVM directory already exists, then exit -if [ -d "${NVM_DIR}" ]; then - echo "NVM already installed." - if [ "${NODE_VERSION}" != "" ]; then - su ${USERNAME} -c "source $NVM_DIR/nvm.sh && nvm install ${NODE_VERSION} && nvm clear-cache" - fi - exit 0 -fi - - -# Run NVM installer as non-root if needed -mkdir -p ${NVM_DIR} -chown ${USERNAME} ${NVM_DIR} -su ${USERNAME} -c "$(cat << EOF - set -e - - # Do not update profile - we'll do this manually - export PROFILE=/dev/null - - curl -so- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash - source ${NVM_DIR}/nvm.sh - if [ "${NODE_VERSION}" != "" ]; then - nvm alias default ${NODE_VERSION} - fi - nvm clear-cache -EOF -)" 2>&1 - -if [ "${UPDATE_RC}" = "true" ]; then - echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc with NVM scripts..." -(cat < /dev/null 2>&1; then - echo "Fixing permissions of \"\$NVM_DIR\"..." - sudoIf chown -R ${USERNAME}:root \$NVM_DIR - else - echo "Warning: NVM directory is not owned by ${USERNAME} and sudo is not installed. Unable to correct permissions." - fi -fi -[ -s "\$NVM_DIR/nvm.sh" ] && . "\$NVM_DIR/nvm.sh" -[ -s "\$NVM_DIR/bash_completion" ] && . "\$NVM_DIR/bash_completion" -EOF -) | tee -a /etc/bash.bashrc >> /etc/zsh/zshrc -fi - -echo "Done!" \ No newline at end of file