Updates for 1.41
This commit is contained in:
		@@ -8,18 +8,34 @@ FROM php:7-cli
 | 
				
			|||||||
# Avoid warnings by switching to noninteractive
 | 
					# Avoid warnings by switching to noninteractive
 | 
				
			||||||
ENV DEBIAN_FRONTEND=noninteractive
 | 
					ENV DEBIAN_FRONTEND=noninteractive
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
 | 
				
			||||||
 | 
					# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
 | 
				
			||||||
 | 
					# will be updated to match your local UID/GID (when using the dockerFile property).
 | 
				
			||||||
 | 
					# See https://aka.ms/vscode-remote/containers/non-root-user for details.
 | 
				
			||||||
 | 
					ARG USERNAME=vscode
 | 
				
			||||||
 | 
					ARG USER_UID=1000
 | 
				
			||||||
 | 
					ARG USER_GID=$USER_UID
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Configure apt and install packages
 | 
					# Configure apt and install packages
 | 
				
			||||||
RUN apt-get update \
 | 
					RUN apt-get update \
 | 
				
			||||||
    && apt-get -y install --no-install-recommends apt-utils 2>&1 \
 | 
					    && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
 | 
				
			||||||
    #
 | 
					    #
 | 
				
			||||||
    # Install git, procps, lsb-release (useful for CLI installs)
 | 
					    # install git iproute2, procps, lsb-release (useful for CLI installs)
 | 
				
			||||||
    && apt-get -y install git procps lsb-release \
 | 
					    && apt-get -y install git iproute2 procps iproute2 lsb-release \
 | 
				
			||||||
	#
 | 
					    #
 | 
				
			||||||
	# Install xdebug
 | 
					    # Install xdebug
 | 
				
			||||||
	&& yes | pecl install xdebug \
 | 
					    && yes | pecl install xdebug \
 | 
				
			||||||
	&& echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
 | 
					    && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
 | 
				
			||||||
	&& echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
 | 
					    && echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
 | 
				
			||||||
	&& echo "xdebug.remote_autostart=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
 | 
					    && echo "xdebug.remote_autostart=on" >> /usr/local/etc/php/conf.d/xdebug.ini \
 | 
				
			||||||
 | 
					    #
 | 
				
			||||||
 | 
					    # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
 | 
				
			||||||
 | 
					    && groupadd --gid $USER_GID $USERNAME \
 | 
				
			||||||
 | 
					    && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
 | 
				
			||||||
 | 
					    # [Optional] Add sudo support for the non-root user
 | 
				
			||||||
 | 
					    && apt-get install -y sudo \
 | 
				
			||||||
 | 
					    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\
 | 
				
			||||||
 | 
					    && chmod 0440 /etc/sudoers.d/$USERNAME \
 | 
				
			||||||
    #
 | 
					    #
 | 
				
			||||||
    # Clean up
 | 
					    # Clean up
 | 
				
			||||||
    && apt-get autoremove -y \
 | 
					    && apt-get autoremove -y \
 | 
				
			||||||
@@ -29,4 +45,3 @@ RUN apt-get update \
 | 
				
			|||||||
# Switch back to dialog for any ad-hoc use of apt-get
 | 
					# Switch back to dialog for any ad-hoc use of apt-get
 | 
				
			||||||
ENV DEBIAN_FRONTEND=dialog
 | 
					ENV DEBIAN_FRONTEND=dialog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,12 +1,26 @@
 | 
				
			|||||||
 | 
					 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	"name": "PHP",
 | 
						"name": "PHP 7",
 | 
				
			||||||
	"dockerFile": "Dockerfile",
 | 
						"dockerFile": "Dockerfile",
 | 
				
			||||||
	"extensions": [
 | 
						
 | 
				
			||||||
        "felixfbecker.php-debug",
 | 
						// Use 'settings' to set *default* container specific settings.json values on container create. 
 | 
				
			||||||
		"felixfbecker.php-intellisense"
 | 
						// You can edit these settings after create using File > Preferences > Settings > Remote.
 | 
				
			||||||
	],
 | 
						"settings": { 
 | 
				
			||||||
	"settings": {
 | 
					 | 
				
			||||||
		"terminal.integrated.shell.linux": "/bin/bash"
 | 
							"terminal.integrated.shell.linux": "/bin/bash"
 | 
				
			||||||
	}
 | 
						},
 | 
				
			||||||
}
 | 
							
 | 
				
			||||||
 | 
						// Use 'appPort' to create a container with published ports. If the port isn't working, be sure
 | 
				
			||||||
 | 
						// your server accepts connections from all interfaces (0.0.0.0 or '*'), not just localhost.
 | 
				
			||||||
 | 
						// "appPort": [],
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// Uncomment the next line to run commands after the container is created.
 | 
				
			||||||
 | 
						// "postCreateCommand": "php -v",
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// Comment out if you want to use root
 | 
				
			||||||
 | 
						"remoteUser": "vscode",
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// Add the IDs of extensions you want installed when the container is created in the array below.
 | 
				
			||||||
 | 
						"extensions": [
 | 
				
			||||||
 | 
							"felixfbecker.php-debug",
 | 
				
			||||||
 | 
							"felixfbecker.php-intellisense"
 | 
				
			||||||
 | 
						]
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										13
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								README.md
									
									
									
									
									
								
							@@ -10,15 +10,24 @@ Follow these steps to open this sample in a container:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
1. If this is your first time using a development container, please follow the [getting started steps](https://aka.ms/vscode-remote/containers/getting-started).
 | 
					1. If this is your first time using a development container, please follow the [getting started steps](https://aka.ms/vscode-remote/containers/getting-started).
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2. If you're not yet in a development container:
 | 
					2. To use this repository, you can either open a locally cloned copy of the code:
 | 
				
			||||||
   - Clone this repository.
 | 
					
 | 
				
			||||||
 | 
					   - Clone this repository to your local filesystem.
 | 
				
			||||||
   - Press <kbd>F1</kbd> and select the **Remote-Containers: Open Folder in Container...** command.
 | 
					   - Press <kbd>F1</kbd> and select the **Remote-Containers: Open Folder in Container...** command.
 | 
				
			||||||
   - Select the cloned copy of this folder, wait for the container to start, and try things out!
 | 
					   - Select the cloned copy of this folder, wait for the container to start, and try things out!
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					   Or open the repository in an isolated Docker volume:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    - Press <kbd>F1</kbd> and select the **Remote-Containers: Try a Sample...** command.
 | 
				
			||||||
 | 
					    - Choose the "Node" sample, wait for the container to start and try things out!
 | 
				
			||||||
 | 
					        > **Note:** Under the hood, this will use **Remote-Containers: Open Repository in Container...** command to clone the source code in a Docker volume instead of the local filesystem.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
## Things to try
 | 
					## Things to try
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Once you have this sample opened in a container, you'll be able to work with it like you would locally.
 | 
					Once you have this sample opened in a container, you'll be able to work with it like you would locally.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					> **Note:** This container runs as a non-root user with sudo access by default. Comment out `"remoteUser": "vscode"` in `.devcontainer/devcontainer.json` if you'd prefer to run as root.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Some things to try:
 | 
					Some things to try:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
1. **Edit:**
 | 
					1. **Edit:**
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user