3.9.0 Feature & Bugfix Release (#394)
* Update openid-connect-generic-client-wrapper.php Add openid-connect-generic-session-expired action before to allow consumers to act on the refresh token expiration * Implement singleton pattern for OpenID_Connect_Generic class This will allow developers who want to be able to call methods belonging to this class (or methods belonging to any of this class's properties) to do so, without having to create a new instance, and therefore repeat all the bootstrapping. Instead, they will just be able to call OpenID_Connect_Generic::instance() to retrieve the singleton. * Add functions.php file for global functions These will act as wrappers for methods you would otherwise call by getting the Open_ID_Connect_Generic singleton and then calling the appropriate method. * Make client_wrapper a public property This allows us to access client_wrapper methods via the singleton of Open_ID_Connect_Generic. * Support aggregated claims (#254) * use tabs instead of spaces * added define config with OIDC_LOGIN_TYPE and OIDC_CLIENT_SCOPE scopes are needed when logging in so this is a no-brainer and this can be deployed using deployments login type can be defined here when you want to enforce SSO from the deployment. * More define-driven settings * fix linting * fix code analysis errors * fix more linting, add more exception handling * Added the OIDC_CREATE_IF_DOES_NOT_EXIST define * Added documentation and phpstan defines * Added data in environment_settings * Fixes QS not being added to the redirect URL * fix #178 Update last-token-response user meta after refresh * add a basic method to refresh user claim outside of this plugin * fix return doc * add a basic method to refresh user claim outside of this plugin * fix return doc * Revert "fix return doc" This reverts commit e19d6f3ffd3f7684dd843408ec911c4b6d614328. * Revert "add a basic method to refresh user claim outside of this plugin" This reverts commit 1a5fa9b045c7b50a17dc3cfd5482fc33be9aa6ee. * Initial Codepsaces Development Environment * Adds Gitpod Support Alongside Codespaces Support * Only load admin CSS when showing settings page * Updates Development Environment for PHP & WordPress - Updates local development environment to use a Composer Docker container. - Updates VS Code/Codespaces devcontainer to bullseye/PHP 7.4. - Updates VS Code/Codespaces devcontainer & GitPod starting commands. - Updates build environment to use PHP 7.4 & Composer 2. - Updates build environment Composer packages. - Updates Composer WordPress install to use the johnpbloch packages. * Fixes Running PHPStan in Docker & Static Analysis Issues - Updates the PHP/Composer Docker image memory limit to allow PHPStand to run properly. - Fixes static analysis issues reported by PHPStan. - Updates PHPStan & extensions to latest versions. - Updates PHPStan configuration for latest version. * Update GitHub Actions for PHP/Composer/WordPress Changes - Updates GitHub Actions to use Composer v2. - Updates GitHub Actions to use PHP 7.4. - Updates GitHub Actions to use WordPress 5.7 as stable. * Updates WordPress Version Composer Dependencies - Updates the installed WordPress version to 5.7. - Updates the installed WordPress stubs version to 5.7. * Fixes GitHub Actions for Composer 2 Changes * Fixes GitHub Actions for PHP Unit testing - Changes PHPUnit switch to dev-master for PHP 8.0. * Updates GrumPHP & GrumPHP Unit Testing PHP 8 Support - Updates GrumPHP to a newer version. - Updates Unit Testing PHP 8.0 to use GrumPHP dev-master. * Updates Unit Testing for PHPUnit Testing w/ PHP8 * Updates Unit Testing Composer Updates to Run w/ PHP 8 * Updates Composer PHPUnit for PHP 8 Override * Multisite/network configurations use your current blog as the default when using the WP_User_Query which means if a user already exists, from a different blog, you will not find them, but also can't create a new account because they already exist. This overrides your current blog and will search 'all' * CodeSpaces Dev Container Updates & Composer Updates * Updating GrumPHP & Composer Dependencies * Updates NPM Modules & Changes Plugin Instance Visibility * Updates @wordpress/scripts & ~wordpress/env to the latest versions. * Changes the visibility of the plugin class instance attribute. * Bump tar from 4.4.13 to 4.4.19 Bumps [tar](https://github.com/npm/node-tar) from 4.4.13 to 4.4.19. - [Release notes](https://github.com/npm/node-tar/releases) - [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-tar/compare/v4.4.13...v4.4.19) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Bump hosted-git-info from 2.8.8 to 2.8.9 Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9. - [Release notes](https://github.com/npm/hosted-git-info/releases) - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md) - [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9) --- updated-dependencies: - dependency-name: hosted-git-info dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Bump lodash from 4.17.19 to 4.17.21 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21) --- updated-dependencies: - dependency-name: lodash dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Bump ssri from 6.0.1 to 6.0.2 Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2) --- updated-dependencies: - dependency-name: ssri dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Bump path-parse from 1.0.6 to 1.0.7 Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Bump ws from 6.2.1 to 6.2.2 Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/6.2.1...6.2.2) --- updated-dependencies: - dependency-name: ws dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * coding standards issues * Fix wordpress coding standards issues * Redone acr-values-support acr-values support * Fix code-standard errors Fixed reported code-standard issues found * Update openid-connect-generic-client.php fixing code-indentment after report * Update openid-connect-generic-client-wrapper.php fix for reported code-standard errors * Update openid-connect-generic-settings-page.php Fixing code-standard reported errors * Update openid-connect-generic-client.php re-aligned line 225 ( indentment error) * Refactors new ACR Handling Code for Better Code Quality * Fixes some incorrect ACR handling code that incorrectly added the ACR when it wasn't set. * Adds missing settings disable handling when ACR constant is set. * Refactors code for simplicity and code quality. * Fixes #243 Nickname from Claim Regression * Fixes the regression caused by the code changes in 3.8.0 which resulted in not performing proper fallbacks for missing cliams such as the nickname. * Fixes invalid Node version in NVM configuration. * Fixes Indentity Mapping & Creation Issues * Fixes issues with improperly handling combinations of the "Link Existing Users", "Create user if does not exist", and "Identify with User Name" configuration options. * Addresses issues related to case sensitivity of usernames when attempting to "Link Existing Users". * Fixes typos and formatting on the plugin Settings screen. * Dependabot Security Related Fixes & Refactoring * Update to require Node v14 & NPM 6.14.15. * Updates to Grunt 1.4.1. * Forces resolution of dependencies for security fixes. * Update @wordpress packages to their latest versions. * Refactors the NPM & Composer scripts. * Updates WP to Latest Dev Standard for Local Development * Refactors Callable Refresh User Claims Function & Action * Moves `openid-connect-generic-update-user-using-current-claim` action to within update user metadata during login. * Adds a new publicly callable method that uses the plugin singleton. * Prep for 3.9.0 Release Co-authored-by: jkouris <35877237+jkouris@users.noreply.github.com> Co-authored-by: Rob Skilling <rob@dxw.com> Co-authored-by: Martin Schanzenbach <schanzen@gnunet.org> Co-authored-by: Chloé "Matcha" Desoutter <chloe.desoutter@bluenove.com> Co-authored-by: Martin <schanzen@users.noreply.github.com> Co-authored-by: Sylwester Kardziejonek <sylwester.kardziejonek@gmail.com> Co-authored-by: Nicolas Dhers <nicolas@rkcreation.fr> Co-authored-by: Tom McCaffery <tom@weareadjacent.com> Co-authored-by: Dan <dan@testinnovators.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: John Kouris <jkouris@everyincome.com> Co-authored-by: Glowsome <administrator@comsolve.nl>isekai^2
Tim Nolte
3 years ago
committed by
GitHub
parent
a283a18fec
commit
d4f0f4b51f
@ -0,0 +1,47 @@
|
|||||||
|
# Note: You can use any Debian/Ubuntu based image you want.
|
||||||
|
FROM mcr.microsoft.com/vscode/devcontainers/base:bullseye
|
||||||
|
|
||||||
|
# [Option] Install zsh
|
||||||
|
ARG INSTALL_ZSH="true"
|
||||||
|
# [Option] Upgrade OS packages to their latest versions
|
||||||
|
ARG UPGRADE_PACKAGES="false"
|
||||||
|
# [Option] Enable non-root Docker access in container
|
||||||
|
ARG ENABLE_NONROOT_DOCKER="true"
|
||||||
|
# [Option] Use the OSS Moby Engine instead of the licensed Docker Engine
|
||||||
|
ARG USE_MOBY="true"
|
||||||
|
|
||||||
|
# Install needed packages and setup non-root user. Use a separate RUN statement to add your
|
||||||
|
# own dependencies. A user of "automatic" attempts to reuse an user ID if one already exists.
|
||||||
|
ARG USERNAME=automatic
|
||||||
|
ARG USER_UID=1000
|
||||||
|
ARG USER_GID=$USER_UID
|
||||||
|
COPY library-scripts/*.sh /tmp/library-scripts/
|
||||||
|
RUN apt-get update \
|
||||||
|
&& /bin/bash /tmp/library-scripts/common-debian.sh "${INSTALL_ZSH}" "${USERNAME}" "${USER_UID}" "${USER_GID}" "${UPGRADE_PACKAGES}" "true" "true" \
|
||||||
|
# Use Docker script from script library to set things up
|
||||||
|
&& /bin/bash /tmp/library-scripts/docker-in-docker-debian.sh "${ENABLE_NONROOT_DOCKER}" "${USERNAME}" "${USE_MOBY}" \
|
||||||
|
# Clean up
|
||||||
|
&& apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/
|
||||||
|
|
||||||
|
VOLUME [ "/var/lib/docker" ]
|
||||||
|
|
||||||
|
# Setting the ENTRYPOINT to docker-init.sh will start up the Docker Engine
|
||||||
|
# inside the container "overrideCommand": false is set in devcontainer.json.
|
||||||
|
# The script will also execute CMD if you need to alter startup behaviors.
|
||||||
|
ENTRYPOINT [ "/usr/local/share/docker-init.sh" ]
|
||||||
|
CMD [ "sleep", "infinity" ]
|
||||||
|
|
||||||
|
# [Optional] Uncomment this section to install additional OS packages.
|
||||||
|
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
||||||
|
&& apt-get -y install php7.4-cli php7.4-curl php7.4-dom php7.4-intl php7.4-json php7.4-mbstring php7.4-xml
|
||||||
|
|
||||||
|
# Install Composer.
|
||||||
|
COPY --from=composer:2 /usr/bin/composer /usr/local/bin/composer
|
||||||
|
|
||||||
|
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
|
||||||
|
# nvm environment variables
|
||||||
|
# ENV NVM_DIR /usr/local/nvm
|
||||||
|
ENV NODE_VERSION 12
|
||||||
|
|
||||||
|
# Install Node Version Manager(NVM).
|
||||||
|
RUN su vscode -c "curl --silent -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash"
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
// 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.192.0/containers/docker-in-docker
|
||||||
|
{
|
||||||
|
"name": "Docker in Docker",
|
||||||
|
"dockerFile": "Dockerfile",
|
||||||
|
"runArgs": ["--init", "--privileged"],
|
||||||
|
"mounts": ["source=dind-var-lib-docker,target=/var/lib/docker,type=volume"],
|
||||||
|
"overrideCommand": false,
|
||||||
|
|
||||||
|
// Set *default* container specific settings.json values on container create.
|
||||||
|
"settings": {},
|
||||||
|
|
||||||
|
// Add the IDs of extensions you want installed when the container is created.
|
||||||
|
"extensions": [
|
||||||
|
"ms-azuretools.vscode-docker"
|
||||||
|
],
|
||||||
|
|
||||||
|
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||||
|
// "forwardPorts": [],
|
||||||
|
|
||||||
|
// Use 'postCreateCommand' to run commands after the container is created.
|
||||||
|
"postCreateCommand": "npm run setup",
|
||||||
|
|
||||||
|
// Use 'postStartCommand' to run commands after the container has started.
|
||||||
|
"postStartCommand": "npm start -- --update",
|
||||||
|
|
||||||
|
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
|
||||||
|
"remoteUser": "vscode"
|
||||||
|
}
|
||||||
@ -0,0 +1,478 @@
|
|||||||
|
#!/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.
|
||||||
|
#-------------------------------------------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/common.md
|
||||||
|
# Maintainer: The VS Code and Codespaces Teams
|
||||||
|
#
|
||||||
|
# Syntax: ./common-debian.sh [install zsh flag] [username] [user UID] [user GID] [upgrade packages flag] [install Oh My Zsh! flag] [Add non-free packages]
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
INSTALL_ZSH=${1:-"true"}
|
||||||
|
USERNAME=${2:-"automatic"}
|
||||||
|
USER_UID=${3:-"automatic"}
|
||||||
|
USER_GID=${4:-"automatic"}
|
||||||
|
UPGRADE_PACKAGES=${5:-"true"}
|
||||||
|
INSTALL_OH_MYS=${6:-"true"}
|
||||||
|
ADD_NON_FREE_PACKAGES=${7:-"false"}
|
||||||
|
SCRIPT_DIR="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
|
||||||
|
MARKER_FILE="/usr/local/etc/vscode-dev-containers/common"
|
||||||
|
|
||||||
|
|
||||||
|
if [ "$(id -u)" -ne 0 ]; then
|
||||||
|
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Ensure that login shells get the correct path if the user updated the PATH using ENV.
|
||||||
|
rm -f /etc/profile.d/00-restore-env.sh
|
||||||
|
echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
|
||||||
|
chmod +x /etc/profile.d/00-restore-env.sh
|
||||||
|
|
||||||
|
# If in automatic mode, determine if a user already exists, if not use vscode
|
||||||
|
if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
|
||||||
|
USERNAME=""
|
||||||
|
POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
|
||||||
|
for CURRENT_USER in ${POSSIBLE_USERS[@]}; do
|
||||||
|
if id -u ${CURRENT_USER} > /dev/null 2>&1; then
|
||||||
|
USERNAME=${CURRENT_USER}
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [ "${USERNAME}" = "" ]; then
|
||||||
|
USERNAME=vscode
|
||||||
|
fi
|
||||||
|
elif [ "${USERNAME}" = "none" ]; then
|
||||||
|
USERNAME=root
|
||||||
|
USER_UID=0
|
||||||
|
USER_GID=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Load markers to see which steps have already run
|
||||||
|
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
|
||||||
|
|
||||||
|
package_list="apt-utils \
|
||||||
|
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 \
|
||||||
|
libkrb5-3 \
|
||||||
|
libgssapi-krb5-2 \
|
||||||
|
libicu[0-9][0-9] \
|
||||||
|
liblttng-ust0 \
|
||||||
|
libstdc++6 \
|
||||||
|
zlib1g \
|
||||||
|
locales \
|
||||||
|
sudo \
|
||||||
|
ncdu \
|
||||||
|
man-db \
|
||||||
|
strace \
|
||||||
|
manpages \
|
||||||
|
manpages-dev \
|
||||||
|
init-system-helpers"
|
||||||
|
|
||||||
|
# Needed for adding manpages-posix and manpages-posix-dev which are non-free packages in Debian
|
||||||
|
if [ "${ADD_NON_FREE_PACKAGES}" = "true" ]; then
|
||||||
|
# Bring in variables from /etc/os-release like VERSION_CODENAME
|
||||||
|
. /etc/os-release
|
||||||
|
sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
|
||||||
|
sed -i -E "s/deb-src http:\/\/(deb|httredir)\.debian\.org\/debian ${VERSION_CODENAME} main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME} main contrib non-free/" /etc/apt/sources.list
|
||||||
|
sed -i -E "s/deb http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
|
||||||
|
sed -i -E "s/deb-src http:\/\/(deb|httpredir)\.debian\.org\/debian ${VERSION_CODENAME}-updates main/deb http:\/\/\1\.debian\.org\/debian ${VERSION_CODENAME}-updates main contrib non-free/" /etc/apt/sources.list
|
||||||
|
sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
|
||||||
|
sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}\/updates main contrib non-free/" /etc/apt/sources.list
|
||||||
|
sed -i "s/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
|
||||||
|
sed -i "s/deb-src http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main/deb http:\/\/deb\.debian\.org\/debian ${VERSION_CODENAME}-backports main contrib non-free/" /etc/apt/sources.list
|
||||||
|
echo "Running apt-get update..."
|
||||||
|
apt-get update
|
||||||
|
package_list="${package_list} manpages-posix manpages-posix-dev"
|
||||||
|
else
|
||||||
|
apt_get_update_if_needed
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 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_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
|
||||||
|
if [ "$(echo "$LIlibssl_packageBSSL" | 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 )
|
||||||
|
|
||||||
|
# Install git if not already installed (may be more recent than distro version)
|
||||||
|
if ! type git > /dev/null 2>&1; then
|
||||||
|
apt-get -y install --no-install-recommends git
|
||||||
|
fi
|
||||||
|
|
||||||
|
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" ] && ! grep -o -E '^\s*en_US.UTF-8\s+UTF-8' /etc/locale.gen > /dev/null; 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.
|
||||||
|
if id -u ${USERNAME} > /dev/null 2>&1; then
|
||||||
|
# User exists, update if needed
|
||||||
|
if [ "${USER_GID}" != "automatic" ] && [ "$USER_GID" != "$(id -G $USERNAME)" ]; then
|
||||||
|
groupmod --gid $USER_GID $USERNAME
|
||||||
|
usermod --gid $USER_GID $USERNAME
|
||||||
|
fi
|
||||||
|
if [ "${USER_UID}" != "automatic" ] && [ "$USER_UID" != "$(id -u $USERNAME)" ]; then
|
||||||
|
usermod --uid $USER_UID $USERNAME
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Create user
|
||||||
|
if [ "${USER_GID}" = "automatic" ]; then
|
||||||
|
groupadd $USERNAME
|
||||||
|
else
|
||||||
|
groupadd --gid $USER_GID $USERNAME
|
||||||
|
fi
|
||||||
|
if [ "${USER_UID}" = "automatic" ]; then
|
||||||
|
useradd -s /bin/bash --gid $USERNAME -m $USERNAME
|
||||||
|
else
|
||||||
|
useradd -s /bin/bash --uid $USER_UID --gid $USERNAME -m $USERNAME
|
||||||
|
fi
|
||||||
|
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
|
||||||
|
|
||||||
|
# ** Shell customization section **
|
||||||
|
if [ "${USERNAME}" = "root" ]; then
|
||||||
|
user_rc_path="/root"
|
||||||
|
else
|
||||||
|
user_rc_path="/home/${USERNAME}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Restore user .bashrc defaults from skeleton file if it doesn't exist or is empty
|
||||||
|
if [ ! -f "${user_rc_path}/.bashrc" ] || [ ! -s "${user_rc_path}/.bashrc" ] ; then
|
||||||
|
cp /etc/skel/.bashrc "${user_rc_path}/.bashrc"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Restore user .profile defaults from skeleton file if it doesn't exist or is empty
|
||||||
|
if [ ! -f "${user_rc_path}/.profile" ] || [ ! -s "${user_rc_path}/.profile" ] ; then
|
||||||
|
cp /etc/skel/.profile "${user_rc_path}/.profile"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# .bashrc/.zshrc snippet
|
||||||
|
rc_snippet="$(cat << 'EOF'
|
||||||
|
|
||||||
|
if [ -z "${USER}" ]; then export USER=$(whoami); fi
|
||||||
|
if [[ "${PATH}" != *"$HOME/.local/bin"* ]]; then export PATH="${PATH}:$HOME/.local/bin"; fi
|
||||||
|
|
||||||
|
# Display optional first run image specific notice if configured and terminal is interactive
|
||||||
|
if [ -t 1 ] && [[ "${TERM_PROGRAM}" = "vscode" || "${TERM_PROGRAM}" = "codespaces" ]] && [ ! -f "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed" ]; then
|
||||||
|
if [ -f "/usr/local/etc/vscode-dev-containers/first-run-notice.txt" ]; then
|
||||||
|
cat "/usr/local/etc/vscode-dev-containers/first-run-notice.txt"
|
||||||
|
elif [ -f "/workspaces/.codespaces/shared/first-run-notice.txt" ]; then
|
||||||
|
cat "/workspaces/.codespaces/shared/first-run-notice.txt"
|
||||||
|
fi
|
||||||
|
mkdir -p "$HOME/.config/vscode-dev-containers"
|
||||||
|
# Mark first run notice as displayed after 10s to avoid problems with fast terminal refreshes hiding it
|
||||||
|
((sleep 10s; touch "$HOME/.config/vscode-dev-containers/first-run-notice-already-displayed") &)
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set the default git editor if not already set
|
||||||
|
if [ -z "$(git config --get core.editor)" ] && [ -z "${GIT_EDITOR}" ]; then
|
||||||
|
if [ "${TERM_PROGRAM}" = "vscode" ]; then
|
||||||
|
if [[ -n $(command -v code-insiders) && -z $(command -v code) ]]; then
|
||||||
|
export GIT_EDITOR="code-insiders --wait"
|
||||||
|
else
|
||||||
|
export GIT_EDITOR="code --wait"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
EOF
|
||||||
|
)"
|
||||||
|
|
||||||
|
# code shim, it fallbacks to code-insiders if code is not available
|
||||||
|
cat << 'EOF' > /usr/local/bin/code
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
get_in_path_except_current() {
|
||||||
|
which -a "$1" | grep -A1 "$0" | grep -v "$0"
|
||||||
|
}
|
||||||
|
|
||||||
|
code="$(get_in_path_except_current code)"
|
||||||
|
|
||||||
|
if [ -n "$code" ]; then
|
||||||
|
exec "$code" "$@"
|
||||||
|
elif [ "$(command -v code-insiders)" ]; then
|
||||||
|
exec code-insiders "$@"
|
||||||
|
else
|
||||||
|
echo "code or code-insiders is not installed" >&2
|
||||||
|
exit 127
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
chmod +x /usr/local/bin/code
|
||||||
|
|
||||||
|
# systemctl shim - tells people to use 'service' if systemd is not running
|
||||||
|
cat << 'EOF' > /usr/local/bin/systemctl
|
||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
if [ -d "/run/systemd/system" ]; then
|
||||||
|
exec /bin/systemctl/systemctl "$@"
|
||||||
|
else
|
||||||
|
echo '\n"systemd" is not running in this container due to its overhead.\nUse the "service" command to start services intead. e.g.: \n\nservice --status-all'
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
chmod +x /usr/local/bin/systemctl
|
||||||
|
|
||||||
|
# Codespaces bash and OMZ themes - partly inspired by https://github.com/ohmyzsh/ohmyzsh/blob/master/themes/robbyrussell.zsh-theme
|
||||||
|
codespaces_bash="$(cat \
|
||||||
|
<<'EOF'
|
||||||
|
|
||||||
|
# Codespaces bash prompt theme
|
||||||
|
__bash_prompt() {
|
||||||
|
local userpart='`export XIT=$? \
|
||||||
|
&& [ ! -z "${GITHUB_USER}" ] && echo -n "\[\033[0;32m\]@${GITHUB_USER} " || echo -n "\[\033[0;32m\]\u " \
|
||||||
|
&& [ "$XIT" -ne "0" ] && echo -n "\[\033[1;31m\]➜" || echo -n "\[\033[0m\]➜"`'
|
||||||
|
local gitbranch='`\
|
||||||
|
export BRANCH=$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD 2>/dev/null); \
|
||||||
|
if [ "${BRANCH}" != "" ]; then \
|
||||||
|
echo -n "\[\033[0;36m\](\[\033[1;31m\]${BRANCH}" \
|
||||||
|
&& if git ls-files --error-unmatch -m --directory --no-empty-directory -o --exclude-standard ":/*" > /dev/null 2>&1; then \
|
||||||
|
echo -n " \[\033[1;33m\]✗"; \
|
||||||
|
fi \
|
||||||
|
&& echo -n "\[\033[0;36m\]) "; \
|
||||||
|
fi`'
|
||||||
|
local lightblue='\[\033[1;34m\]'
|
||||||
|
local removecolor='\[\033[0m\]'
|
||||||
|
PS1="${userpart} ${lightblue}\w ${gitbranch}${removecolor}\$ "
|
||||||
|
unset -f __bash_prompt
|
||||||
|
}
|
||||||
|
__bash_prompt
|
||||||
|
|
||||||
|
EOF
|
||||||
|
)"
|
||||||
|
|
||||||
|
codespaces_zsh="$(cat \
|
||||||
|
<<'EOF'
|
||||||
|
# Codespaces zsh prompt theme
|
||||||
|
__zsh_prompt() {
|
||||||
|
local prompt_username
|
||||||
|
if [ ! -z "${GITHUB_USER}" ]; then
|
||||||
|
prompt_username="@${GITHUB_USER}"
|
||||||
|
else
|
||||||
|
prompt_username="%n"
|
||||||
|
fi
|
||||||
|
PROMPT="%{$fg[green]%}${prompt_username} %(?:%{$reset_color%}➜ :%{$fg_bold[red]%}➜ )" # User/exit code arrow
|
||||||
|
PROMPT+='%{$fg_bold[blue]%}%(5~|%-1~/…/%3~|%4~)%{$reset_color%} ' # cwd
|
||||||
|
PROMPT+='$(git_prompt_info)%{$fg[white]%}$ %{$reset_color%}' # Git status
|
||||||
|
unset -f __zsh_prompt
|
||||||
|
}
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[cyan]%}(%{$fg_bold[red]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg_bold[yellow]%}✗%{$fg_bold[cyan]%})"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[cyan]%})"
|
||||||
|
__zsh_prompt
|
||||||
|
|
||||||
|
EOF
|
||||||
|
)"
|
||||||
|
|
||||||
|
# Add notice that Oh My Bash! has been removed from images and how to provide information on how to install manually
|
||||||
|
omb_readme="$(cat \
|
||||||
|
<<'EOF'
|
||||||
|
"Oh My Bash!" has been removed from this image in favor of a simple shell prompt. If you
|
||||||
|
still wish to use it, remove "~/.oh-my-bash" and install it from: https://github.com/ohmybash/oh-my-bash
|
||||||
|
You may also want to consider "Bash-it" as an alternative: https://github.com/bash-it/bash-it
|
||||||
|
See here for infomation on adding it to your image or dotfiles: https://aka.ms/codespaces/omb-remove
|
||||||
|
EOF
|
||||||
|
)"
|
||||||
|
omb_stub="$(cat \
|
||||||
|
<<'EOF'
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
if [ -t 1 ]; then
|
||||||
|
cat $HOME/.oh-my-bash/README.md
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
)"
|
||||||
|
|
||||||
|
# Add RC snippet and custom bash prompt
|
||||||
|
if [ "${RC_SNIPPET_ALREADY_ADDED}" != "true" ]; then
|
||||||
|
echo "${rc_snippet}" >> /etc/bash.bashrc
|
||||||
|
echo "${codespaces_bash}" >> "${user_rc_path}/.bashrc"
|
||||||
|
echo 'export PROMPT_DIRTRIM=4' >> "${user_rc_path}/.bashrc"
|
||||||
|
if [ "${USERNAME}" != "root" ]; then
|
||||||
|
echo "${codespaces_bash}" >> "/root/.bashrc"
|
||||||
|
echo 'export PROMPT_DIRTRIM=4' >> "/root/.bashrc"
|
||||||
|
fi
|
||||||
|
chown ${USERNAME}:${USERNAME} "${user_rc_path}/.bashrc"
|
||||||
|
RC_SNIPPET_ALREADY_ADDED="true"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Add stub for Oh My Bash!
|
||||||
|
if [ ! -d "${user_rc_path}/.oh-my-bash}" ] && [ "${INSTALL_OH_MYS}" = "true" ]; then
|
||||||
|
mkdir -p "${user_rc_path}/.oh-my-bash" "/root/.oh-my-bash"
|
||||||
|
echo "${omb_readme}" >> "${user_rc_path}/.oh-my-bash/README.md"
|
||||||
|
echo "${omb_stub}" >> "${user_rc_path}/.oh-my-bash/oh-my-bash.sh"
|
||||||
|
chmod +x "${user_rc_path}/.oh-my-bash/oh-my-bash.sh"
|
||||||
|
if [ "${USERNAME}" != "root" ]; then
|
||||||
|
echo "${omb_readme}" >> "/root/.oh-my-bash/README.md"
|
||||||
|
echo "${omb_stub}" >> "/root/.oh-my-bash/oh-my-bash.sh"
|
||||||
|
chmod +x "/root/.oh-my-bash/oh-my-bash.sh"
|
||||||
|
fi
|
||||||
|
chown -R "${USERNAME}:${USERNAME}" "${user_rc_path}/.oh-my-bash"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Optionally install and configure zsh and Oh My Zsh!
|
||||||
|
if [ "${INSTALL_ZSH}" = "true" ]; then
|
||||||
|
if ! type zsh > /dev/null 2>&1; then
|
||||||
|
apt_get_update_if_needed
|
||||||
|
apt-get install -y zsh
|
||||||
|
fi
|
||||||
|
if [ "${ZSH_ALREADY_INSTALLED}" != "true" ]; then
|
||||||
|
echo "${rc_snippet}" >> /etc/zsh/zshrc
|
||||||
|
ZSH_ALREADY_INSTALLED="true"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Adapted, simplified inline Oh My Zsh! install steps that adds, defaults to a codespaces theme.
|
||||||
|
# See https://github.com/ohmyzsh/ohmyzsh/blob/master/tools/install.sh for official script.
|
||||||
|
oh_my_install_dir="${user_rc_path}/.oh-my-zsh"
|
||||||
|
if [ ! -d "${oh_my_install_dir}" ] && [ "${INSTALL_OH_MYS}" = "true" ]; then
|
||||||
|
template_path="${oh_my_install_dir}/templates/zshrc.zsh-template"
|
||||||
|
user_rc_file="${user_rc_path}/.zshrc"
|
||||||
|
umask g-w,o-w
|
||||||
|
mkdir -p ${oh_my_install_dir}
|
||||||
|
git clone --depth=1 \
|
||||||
|
-c core.eol=lf \
|
||||||
|
-c core.autocrlf=false \
|
||||||
|
-c fsck.zeroPaddedFilemode=ignore \
|
||||||
|
-c fetch.fsck.zeroPaddedFilemode=ignore \
|
||||||
|
-c receive.fsck.zeroPaddedFilemode=ignore \
|
||||||
|
"https://github.com/ohmyzsh/ohmyzsh" "${oh_my_install_dir}" 2>&1
|
||||||
|
echo -e "$(cat "${template_path}")\nDISABLE_AUTO_UPDATE=true\nDISABLE_UPDATE_PROMPT=true" > ${user_rc_file}
|
||||||
|
sed -i -e 's/ZSH_THEME=.*/ZSH_THEME="codespaces"/g' ${user_rc_file}
|
||||||
|
|
||||||
|
mkdir -p ${oh_my_install_dir}/custom/themes
|
||||||
|
echo "${codespaces_zsh}" > "${oh_my_install_dir}/custom/themes/codespaces.zsh-theme"
|
||||||
|
# Shrink git while still enabling updates
|
||||||
|
cd "${oh_my_install_dir}"
|
||||||
|
git repack -a -d -f --depth=1 --window=1
|
||||||
|
# Copy to non-root user if one is specified
|
||||||
|
if [ "${USERNAME}" != "root" ]; then
|
||||||
|
cp -rf "${user_rc_file}" "${oh_my_install_dir}" /root
|
||||||
|
chown -R ${USERNAME}:${USERNAME} "${user_rc_path}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Persist image metadata info, script if meta.env found in same directory
|
||||||
|
meta_info_script="$(cat << 'EOF'
|
||||||
|
#!/bin/sh
|
||||||
|
. /usr/local/etc/vscode-dev-containers/meta.env
|
||||||
|
|
||||||
|
# Minimal output
|
||||||
|
if [ "$1" = "version" ] || [ "$1" = "image-version" ]; then
|
||||||
|
echo "${VERSION}"
|
||||||
|
exit 0
|
||||||
|
elif [ "$1" = "release" ]; then
|
||||||
|
echo "${GIT_REPOSITORY_RELEASE}"
|
||||||
|
exit 0
|
||||||
|
elif [ "$1" = "content" ] || [ "$1" = "content-url" ] || [ "$1" = "contents" ] || [ "$1" = "contents-url" ]; then
|
||||||
|
echo "${CONTENTS_URL}"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
#Full output
|
||||||
|
echo
|
||||||
|
echo "Development container image information"
|
||||||
|
echo
|
||||||
|
if [ ! -z "${VERSION}" ]; then echo "- Image version: ${VERSION}"; fi
|
||||||
|
if [ ! -z "${DEFINITION_ID}" ]; then echo "- Definition ID: ${DEFINITION_ID}"; fi
|
||||||
|
if [ ! -z "${VARIANT}" ]; then echo "- Variant: ${VARIANT}"; fi
|
||||||
|
if [ ! -z "${GIT_REPOSITORY}" ]; then echo "- Source code repository: ${GIT_REPOSITORY}"; fi
|
||||||
|
if [ ! -z "${GIT_REPOSITORY_RELEASE}" ]; then echo "- Source code release/branch: ${GIT_REPOSITORY_RELEASE}"; fi
|
||||||
|
if [ ! -z "${BUILD_TIMESTAMP}" ]; then echo "- Timestamp: ${BUILD_TIMESTAMP}"; fi
|
||||||
|
if [ ! -z "${CONTENTS_URL}" ]; then echo && echo "More info: ${CONTENTS_URL}"; fi
|
||||||
|
echo
|
||||||
|
EOF
|
||||||
|
)"
|
||||||
|
if [ -f "${SCRIPT_DIR}/meta.env" ]; then
|
||||||
|
mkdir -p /usr/local/etc/vscode-dev-containers/
|
||||||
|
cp -f "${SCRIPT_DIR}/meta.env" /usr/local/etc/vscode-dev-containers/meta.env
|
||||||
|
echo "${meta_info_script}" > /usr/local/bin/devcontainer-info
|
||||||
|
chmod +x /usr/local/bin/devcontainer-info
|
||||||
|
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!"
|
||||||
@ -0,0 +1,230 @@
|
|||||||
|
#!/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.
|
||||||
|
#-------------------------------------------------------------------------------------------------------------
|
||||||
|
#
|
||||||
|
# Docs: https://github.com/microsoft/vscode-dev-containers/blob/main/script-library/docs/docker-in-docker.md
|
||||||
|
# Maintainer: The VS Code and Codespaces Teams
|
||||||
|
#
|
||||||
|
# Syntax: ./docker-in-docker-debian.sh [enable non-root docker access flag] [non-root user] [use moby]
|
||||||
|
|
||||||
|
ENABLE_NONROOT_DOCKER=${1:-"true"}
|
||||||
|
USERNAME=${2:-"automatic"}
|
||||||
|
USE_MOBY=${3:-"true"}
|
||||||
|
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
if [ "$(id -u)" -ne 0 ]; then
|
||||||
|
echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Determine the appropriate non-root user
|
||||||
|
if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
|
||||||
|
USERNAME=""
|
||||||
|
POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
|
||||||
|
for CURRENT_USER in ${POSSIBLE_USERS[@]}; do
|
||||||
|
if id -u ${CURRENT_USER} > /dev/null 2>&1; then
|
||||||
|
USERNAME=${CURRENT_USER}
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [ "${USERNAME}" = "" ]; then
|
||||||
|
USERNAME=root
|
||||||
|
fi
|
||||||
|
elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
|
||||||
|
USERNAME=root
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Get central common setting
|
||||||
|
get_common_setting() {
|
||||||
|
if [ "${common_settings_file_loaded}" != "true" ]; then
|
||||||
|
curl -sfL "https://aka.ms/vscode-dev-containers/script-library/settings.env" 2>/dev/null -o /tmp/vsdc-settings.env || echo "Could not download settings file. Skipping."
|
||||||
|
common_settings_file_loaded=true
|
||||||
|
fi
|
||||||
|
if [ -f "/tmp/vsdc-settings.env" ]; then
|
||||||
|
local multi_line=""
|
||||||
|
if [ "$2" = "true" ]; then multi_line="-z"; fi
|
||||||
|
local result="$(grep ${multi_line} -oP "$1=\"?\K[^\"]+" /tmp/vsdc-settings.env | tr -d '\0')"
|
||||||
|
if [ ! -z "${result}" ]; then declare -g $1="${result}"; fi
|
||||||
|
fi
|
||||||
|
echo "$1=${!1}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Function to run 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
|
||||||
|
}
|
||||||
|
|
||||||
|
# Checks if packages are installed and installs them if not
|
||||||
|
check_packages() {
|
||||||
|
if ! dpkg -s "$@" > /dev/null 2>&1; then
|
||||||
|
apt_get_update_if_needed
|
||||||
|
apt-get -y install --no-install-recommends "$@"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Ensure apt is in non-interactive to avoid prompts
|
||||||
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
# Install dependencies
|
||||||
|
check_packages apt-transport-https curl ca-certificates lxc pigz iptables gnupg2
|
||||||
|
|
||||||
|
# Swap to legacy iptables for compatibility
|
||||||
|
if type iptables-legacy > /dev/null 2>&1; then
|
||||||
|
update-alternatives --set iptables /usr/sbin/iptables-legacy
|
||||||
|
update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Install Docker / Moby CLI if not already installed
|
||||||
|
if type docker > /dev/null 2>&1 && type dockerd > /dev/null 2>&1; then
|
||||||
|
echo "Docker / Moby CLI and Engine already installed."
|
||||||
|
else
|
||||||
|
# Source /etc/os-release to get OS info
|
||||||
|
. /etc/os-release
|
||||||
|
if [ "${USE_MOBY}" = "true" ]; then
|
||||||
|
# Import key safely (new 'signed-by' method rather than deprecated apt-key approach) and install
|
||||||
|
get_common_setting MICROSOFT_GPG_KEYS_URI
|
||||||
|
curl -sSL ${MICROSOFT_GPG_KEYS_URI} | gpg --dearmor > /usr/share/keyrings/microsoft-archive-keyring.gpg
|
||||||
|
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/repos/microsoft-${ID}-${VERSION_CODENAME}-prod ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/microsoft.list
|
||||||
|
apt-get update
|
||||||
|
apt-get -y install --no-install-recommends moby-cli moby-buildx moby-compose moby-engine
|
||||||
|
else
|
||||||
|
# Import key safely (new 'signed-by' method rather than deprecated apt-key approach) and install
|
||||||
|
curl -fsSL https://download.docker.com/linux/${ID}/gpg | gpg --dearmor > /usr/share/keyrings/docker-archive-keyring.gpg
|
||||||
|
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/${ID} ${VERSION_CODENAME} stable" > /etc/apt/sources.list.d/docker.list
|
||||||
|
apt-get update
|
||||||
|
apt-get -y install --no-install-recommends docker-ce-cli docker-ce
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Finished installing docker / moby"
|
||||||
|
|
||||||
|
# Install Docker Compose if not already installed and is on a supported architecture
|
||||||
|
if type docker-compose > /dev/null 2>&1; then
|
||||||
|
echo "Docker Compose already installed."
|
||||||
|
else
|
||||||
|
TARGET_COMPOSE_ARCH="$(uname -m)"
|
||||||
|
if [ "${TARGET_COMPOSE_ARCH}" = "amd64" ]; then
|
||||||
|
TARGET_COMPOSE_ARCH="x86_64"
|
||||||
|
fi
|
||||||
|
if [ "${TARGET_COMPOSE_ARCH}" != "x86_64" ]; then
|
||||||
|
# Use pip to get a version that runns on this architecture
|
||||||
|
if ! dpkg -s python3-minimal python3-pip libffi-dev python3-venv pipx > /dev/null 2>&1; then
|
||||||
|
apt_get_update_if_needed
|
||||||
|
apt-get -y install python3-minimal python3-pip libffi-dev python3-venv pipx
|
||||||
|
fi
|
||||||
|
export PIPX_HOME=/usr/local/pipx
|
||||||
|
mkdir -p ${PIPX_HOME}
|
||||||
|
export PIPX_BIN_DIR=/usr/local/bin
|
||||||
|
export PIP_CACHE_DIR=/tmp/pip-tmp/cache
|
||||||
|
pipx install --system-site-packages --pip-args '--no-cache-dir --force-reinstall' docker-compose
|
||||||
|
rm -rf /tmp/pip-tmp
|
||||||
|
else
|
||||||
|
LATEST_COMPOSE_VERSION=$(basename "$(curl -fsSL -o /dev/null -w "%{url_effective}" https://github.com/docker/compose/releases/latest)")
|
||||||
|
curl -fsSL "https://github.com/docker/compose/releases/download/${LATEST_COMPOSE_VERSION}/docker-compose-$(uname -s)-${TARGET_COMPOSE_ARCH}" -o /usr/local/bin/docker-compose
|
||||||
|
chmod +x /usr/local/bin/docker-compose
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If init file already exists, exit
|
||||||
|
if [ -f "/usr/local/share/docker-init.sh" ]; then
|
||||||
|
echo "/usr/local/share/docker-init.sh already exists, so exiting."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "docker-init doesnt exist..."
|
||||||
|
|
||||||
|
# Add user to the docker group
|
||||||
|
if [ "${ENABLE_NONROOT_DOCKER}" = "true" ]; then
|
||||||
|
if ! getent group docker > /dev/null 2>&1; then
|
||||||
|
groupadd docker
|
||||||
|
fi
|
||||||
|
usermod -aG docker ${USERNAME}
|
||||||
|
fi
|
||||||
|
|
||||||
|
tee /usr/local/share/docker-init.sh > /dev/null \
|
||||||
|
<< 'EOF'
|
||||||
|
#!/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.
|
||||||
|
#-------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
sudoIf()
|
||||||
|
{
|
||||||
|
if [ "$(id -u)" -ne 0 ]; then
|
||||||
|
sudo "$@"
|
||||||
|
else
|
||||||
|
"$@"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# explicitly remove dockerd and containerd PID file to ensure that it can start properly if it was stopped uncleanly
|
||||||
|
# ie: docker kill <ID>
|
||||||
|
sudoIf find /run /var/run -iname 'docker*.pid' -delete || :
|
||||||
|
sudoIf find /run /var/run -iname 'container*.pid' -delete || :
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
## Dind wrapper script from docker team
|
||||||
|
# Maintained: https://github.com/moby/moby/blob/master/hack/dind
|
||||||
|
|
||||||
|
export container=docker
|
||||||
|
|
||||||
|
if [ -d /sys/kernel/security ] && ! sudoIf mountpoint -q /sys/kernel/security; then
|
||||||
|
sudoIf mount -t securityfs none /sys/kernel/security || {
|
||||||
|
echo >&2 'Could not mount /sys/kernel/security.'
|
||||||
|
echo >&2 'AppArmor detection and --privileged mode might break.'
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Mount /tmp (conditionally)
|
||||||
|
if ! sudoIf mountpoint -q /tmp; then
|
||||||
|
sudoIf mount -t tmpfs none /tmp
|
||||||
|
fi
|
||||||
|
|
||||||
|
# cgroup v2: enable nesting
|
||||||
|
if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
|
||||||
|
# move the init process (PID 1) from the root group to the /init group,
|
||||||
|
# otherwise writing subtree_control fails with EBUSY.
|
||||||
|
sudoIf mkdir -p /sys/fs/cgroup/init
|
||||||
|
sudoIf echo 1 > /sys/fs/cgroup/init/cgroup.procs
|
||||||
|
# enable controllers
|
||||||
|
sudoIf sed -e 's/ / +/g' -e 's/^/+/' < /sys/fs/cgroup/cgroup.controllers \
|
||||||
|
> /sys/fs/cgroup/cgroup.subtree_control
|
||||||
|
fi
|
||||||
|
## Dind wrapper over.
|
||||||
|
|
||||||
|
# Handle DNS
|
||||||
|
set +e
|
||||||
|
cat /etc/resolv.conf | grep -i 'internal.cloudapp.net'
|
||||||
|
if [ $? -eq 0 ]
|
||||||
|
then
|
||||||
|
echo "Setting dockerd Azure DNS."
|
||||||
|
CUSTOMDNS="--dns 168.63.129.16"
|
||||||
|
else
|
||||||
|
echo "Not setting dockerd DNS manually."
|
||||||
|
CUSTOMDNS=""
|
||||||
|
fi
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Start docker/moby engine
|
||||||
|
( sudoIf dockerd $CUSTOMDNS > /tmp/dockerd.log 2>&1 ) &
|
||||||
|
|
||||||
|
set +e
|
||||||
|
|
||||||
|
# Execute whatever commands were passed in (if any). This allows us
|
||||||
|
# to set this script to ENTRYPOINT while still executing the default CMD.
|
||||||
|
exec "$@"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
chmod +x /usr/local/share/docker-init.sh
|
||||||
|
chown ${USERNAME}:root /usr/local/share/docker-init.sh
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
# List the start up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/
|
||||||
|
tasks:
|
||||||
|
- name: WordPress Development Environment
|
||||||
|
init: npm run setup # runs during prebuild
|
||||||
|
command: |
|
||||||
|
npm start -- --update
|
||||||
|
npm stop
|
||||||
|
npm start -- --update
|
||||||
|
|
||||||
|
# List the ports to expose. Learn more https://www.gitpod.io/docs/config-ports/
|
||||||
|
ports:
|
||||||
|
- port: 8888
|
||||||
|
onOpen: notify
|
||||||
|
visibility: public
|
||||||
|
- port: 8889
|
||||||
|
onOpen: notify
|
||||||
|
visibility: public
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"type": "npm",
|
||||||
|
"script": "build",
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": true
|
||||||
|
},
|
||||||
|
"problemMatcher": [],
|
||||||
|
"label": "npm: build",
|
||||||
|
"detail": "npm run grunt build"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,21 @@
|
|||||||
|
# This is the Compose file for command-line services.
|
||||||
|
# Anything that doesn't need to be run as part of the main `docker-compose up'
|
||||||
|
# command should reside in here and be invoked by a helper script.
|
||||||
|
version: "3.7"
|
||||||
|
services:
|
||||||
|
dev:
|
||||||
|
build: .devcontainer
|
||||||
|
working_dir: /app
|
||||||
|
user: 1000:1000
|
||||||
|
volumes:
|
||||||
|
- .:/app:cached
|
||||||
|
composer:
|
||||||
|
build: ./tools/docker/composer
|
||||||
|
entrypoint: composer
|
||||||
|
working_dir: /app
|
||||||
|
user: 1000:1000
|
||||||
|
volumes:
|
||||||
|
- .:/app:cached
|
||||||
|
- ~/.composer:/root/.composer:cached
|
||||||
|
volumes:
|
||||||
|
{}
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Global OIDCG functions.
|
||||||
|
*
|
||||||
|
* @package OpenID_Connect_Generic
|
||||||
|
* @author Jonathan Daggerhart <jonathan@daggerhart.com>
|
||||||
|
* @copyright 2015-2020 daggerhart
|
||||||
|
* @license http://www.gnu.org/licenses/gpl-2.0.txt GPL-2.0+
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a single use authentication URL.
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
function oidcg_get_authentication_url() {
|
||||||
|
return \OpenID_Connect_Generic::instance()->client_wrapper->get_authentication_url();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Refresh a user claim and update the user metadata.
|
||||||
|
*
|
||||||
|
* @param WP_User $user The user object.
|
||||||
|
* @param array $token_response The token response.
|
||||||
|
*
|
||||||
|
* @return WP_Error|array
|
||||||
|
*/
|
||||||
|
function oidcg_refresh_user_claim( $user, $token_response ) {
|
||||||
|
return \OpenID_Connect_Generic::instance()->client_wrapper->refresh_user_claim( $user, $token_response );
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,20 @@
|
|||||||
|
# Start with the official PHP CLI image.
|
||||||
|
FROM php:7.4-cli
|
||||||
|
|
||||||
|
# Increase the memory limit to allow for large processes, such as PHPStan.
|
||||||
|
RUN cd /usr/local/etc/php/conf.d/ && \
|
||||||
|
echo 'memory_limit = -1' >> /usr/local/etc/php/conf.d/docker-php-ram-limit.ini
|
||||||
|
|
||||||
|
# Copy the Composer PHAR from the official Composer image to the PHP CLI image.
|
||||||
|
COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
|
||||||
|
|
||||||
|
# Install additional packages required for Composer
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y git zip unzip zlib1g-dev libzip-dev \
|
||||||
|
&& apt-get -y autoremove \
|
||||||
|
&& apt-get clean \
|
||||||
|
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||||
|
|
||||||
|
RUN docker-php-ext-install zip \
|
||||||
|
&& docker-php-ext-install pcntl \
|
||||||
|
&& docker-php-ext-install bcmath
|
||||||
Loading…
Reference in New Issue