From a16b56ed203fd8d0f3d2d73462ff602e0045ed2c Mon Sep 17 00:00:00 2001 From: Ada Lundhe Date: Fri, 9 Feb 2024 21:41:51 -0600 Subject: [PATCH] Remove Kubernetes SHIM image --- .github/workflows/build.yml | 43 -- golang/Dockerfile.golang | 29 +- kubernetes/Dockerfile.kubernetes | 40 -- kubernetes/copy-kube-config.sh | 31 -- kubernetes/devcontainer.json | 41 -- kubernetes/library-scripts/README.md | 5 - kubernetes/library-scripts/common-debian.sh | 403 ------------------ node/Dockerfile.node | 28 +- python/Dockerfile.python | 28 +- .../docker-debian.sh | 0 {kubernetes => resources}/install_k9s.sh | 0 .../kubectl-helm-debian.sh | 0 12 files changed, 76 insertions(+), 572 deletions(-) delete mode 100644 kubernetes/Dockerfile.kubernetes delete mode 100644 kubernetes/copy-kube-config.sh delete mode 100644 kubernetes/devcontainer.json delete mode 100644 kubernetes/library-scripts/README.md delete mode 100755 kubernetes/library-scripts/common-debian.sh rename {kubernetes/library-scripts => resources}/docker-debian.sh (100%) rename {kubernetes => resources}/install_k9s.sh (100%) rename {kubernetes/library-scripts => resources}/kubectl-helm-debian.sh (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e89834b..d4e8da9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -101,46 +101,3 @@ jobs: build-args: | VERSION=${{matrix.golang_version}} BASE=${{env.IMAGE_OS}} - - build_variant_kubernetes: - strategy: - matrix: - language_and_version: [ - "python-3.10", - "python-3.11", - "python-3.12", - "node-20", - "node-21", - "golang-1.20", - "golang-1.21", - "golang-1.22" - ] - env: - REGISTRY: corpheus91/devcontainers - IMAGE_OS: "bookworm" - runs-on: ubuntu-latest - needs: [ - build_core_python, - build_core_node, - build_core_golang - ] - steps: - - uses: actions/checkout@master - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v5 - with: - platforms: linux/amd64,linux/arm64 - push: true - file: kubernetes/Dockerfile.kubernetes - tags: corpheus91/devcontainers:${{matrix.language_and_version}}-kubernetes - build-args: | - IMAGE=${{env.REGISTRY}}:${{matrix.language_and_version}}-${{env.IMAGE_OS}} diff --git a/golang/Dockerfile.golang b/golang/Dockerfile.golang index 167e4b3..63c915f 100644 --- a/golang/Dockerfile.golang +++ b/golang/Dockerfile.golang @@ -34,7 +34,30 @@ COPY resources/common_debian.sh /tmp/common_debian.sh RUN apt update && bash /tmp/common_debian.sh "true" "${USERNAME}" "${USER_UID}" "${USER_GID}" "true" "true" "true" \ && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* -COPY resources/post_install.sh /usr/local/share/post_install.sh -RUN chmod +X /usr/local/share/post_install.sh -ENTRYPOINT [ "/usr/local/share/post_install.sh" ] +COPY resources/library-scripts/*.sh /tmp/library-scripts/ + +RUN apt-get update \ + && /bin/bash /tmp/library-scripts/docker-debian.sh "true" "/var/run/docker-host.sock" "/var/run/docker.sock" "${USERNAME}" "${USE_MOBY}" \ + && /bin/bash /tmp/library-scripts/kubectl-helm-debian.sh "latest" "latest" "none" \ + && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/ + +# Script copies localhost's ~/.kube/config file into the container and swaps out +# localhost for host.docker.internal on bash/zsh start to keep them in sync. +COPY resources/copy-kube-config.sh /usr/local/share/ +RUN chown ${USERNAME}:root /usr/local/share/copy-kube-config.sh \ + && echo "source /usr/local/share/copy-kube-config.sh" | tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc + +# [Optional] Uncomment this section to install additional OS packages. +RUN apt update \ + && apt -y install --no-install-recommends kubectx make wget + +COPY resources/install_k9s.sh ./install_k9s.sh + +RUN /bin/bash install_k9s.sh + +# Setting the ENTRYPOINT to docker-init.sh will configure non-root access to +# the Docker socket if "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" ] diff --git a/kubernetes/Dockerfile.kubernetes b/kubernetes/Dockerfile.kubernetes deleted file mode 100644 index 352fbdd..0000000 --- a/kubernetes/Dockerfile.kubernetes +++ /dev/null @@ -1,40 +0,0 @@ -# Note: You can use any Debian/Ubuntu based image you want. -ARG IMAGE -FROM ${IMAGE} -# Enable new "BUILDKIT" mode for Docker CLI -ENV DOCKER_BUILDKIT=1 \ - PATH=$PATH:/usr/local/go/bin \ - TERM=xterm-256color - -# Options -ARG INSTALL_ZSH="true" -ARG UPGRADE_PACKAGES="false" -ARG USE_MOBY="true" -ARG USERNAME=vscode -# Install needed packages and setup non-root user. Use a separate RUN statement to add your own dependencies. -COPY kubernetes/library-scripts/*.sh /tmp/library-scripts/ - -RUN apt-get update \ - && /bin/bash /tmp/library-scripts/docker-debian.sh "true" "/var/run/docker-host.sock" "/var/run/docker.sock" "${USERNAME}" "${USE_MOBY}" \ - && /bin/bash /tmp/library-scripts/kubectl-helm-debian.sh "latest" "latest" "none" \ - && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/ - -# Script copies localhost's ~/.kube/config file into the container and swaps out -# localhost for host.docker.internal on bash/zsh start to keep them in sync. -COPY kubernetes/copy-kube-config.sh /usr/local/share/ -RUN chown ${USERNAME}:root /usr/local/share/copy-kube-config.sh \ - && echo "source /usr/local/share/copy-kube-config.sh" | tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc - -# [Optional] Uncomment this section to install additional OS packages. -RUN apt update \ - && apt -y install --no-install-recommends kubectx make wget - -COPY kubernetes/install_k9s.sh ./install_k9s.sh - -RUN /bin/bash install_k9s.sh - -# Setting the ENTRYPOINT to docker-init.sh will configure non-root access to -# the Docker socket if "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" ] diff --git a/kubernetes/copy-kube-config.sh b/kubernetes/copy-kube-config.sh deleted file mode 100644 index 2d77a33..0000000 --- a/kubernetes/copy-kube-config.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -i - -# Copies localhost's ~/.kube/config file into the container and swap out localhost -# for host.docker.internal whenever a new shell starts to keep them in sync. -if [ "$SYNC_LOCALHOST_KUBECONFIG" = "true" ] && [ -d "/usr/local/share/kube-localhost" ]; then - mkdir -p $HOME/.kube - sudo cp -r /usr/local/share/kube-localhost/* $HOME/.kube - sudo chown -R $(id -u) $HOME/.kube - sed -i -e "s/localhost/host.docker.internal/g" $HOME/.kube/config - sed -i -e "s/127.0.0.1/host.docker.internal/g" $HOME/.kube/config - - # If .minikube was mounted, set up client cert/key - if [ -d "/usr/local/share/minikube-localhost" ]; then - mkdir -p $HOME/.minikube - sudo cp -r /usr/local/share/minikube-localhost/ca.crt $HOME/.minikube - # Location varies between versions of minikube - if [ -f "/usr/local/share/minikube-localhost/client.crt" ]; then - sudo cp -r /usr/local/share/minikube-localhost/client.crt $HOME/.minikube - sudo cp -r /usr/local/share/minikube-localhost/client.key $HOME/.minikube - elif [ -f "/usr/local/share/minikube-localhost/profiles/minikube/client.crt" ]; then - sudo cp -r /usr/local/share/minikube-localhost/profiles/minikube/client.crt $HOME/.minikube - sudo cp -r /usr/local/share/minikube-localhost/profiles/minikube/client.key $HOME/.minikube - fi - sudo chown -R $(id -u) $HOME/.minikube - - # Point .kube/config to the correct locaiton of the certs - sed -i -r "s|(\s*certificate-authority:\s).*|\\1$HOME\/.minikube\/ca.crt|g" $HOME/.kube/config - sed -i -r "s|(\s*client-certificate:\s).*|\\1$HOME\/.minikube\/client.crt|g" $HOME/.kube/config - sed -i -r "s|(\s*client-key:\s).*|\\1$HOME\/.minikube\/client.key|g" $HOME/.kube/config - fi -fi \ No newline at end of file diff --git a/kubernetes/devcontainer.json b/kubernetes/devcontainer.json deleted file mode 100644 index 7d894bd..0000000 --- a/kubernetes/devcontainer.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "Kubernetes - Local Configuration", - "dockerFile": "Dockerfile", - "overrideCommand": false, - - "remoteEnv": { - "SYNC_LOCALHOST_KUBECONFIG": "true" - }, - - "mounts": [ - "source=/var/run/docker.sock,target=/var/run/docker-host.sock,type=bind", - "source=${env:HOME}${env:USERPROFILE}/.kube,target=/usr/local/share/kube-localhost,type=bind" - // Uncomment the next line to also sync certs in your .minikube folder - // "source=${env:HOME}${env:USERPROFILE}/.minikube,target=/usr/local/share/minikube-localhost,type=bind" - ], - - // Configure tool-specific properties. - "customizations": { - // Configure properties specific to VS Code. - "vscode": { - // Add the IDs of extensions you want installed when the container is created. - "extensions": [ - "ms-azuretools.vscode-docker", - "ms-kubernetes-tools.vscode-kubernetes-tools" - ] - } - }, - - // 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": "kubectl version", - - // Uncomment when using a ptrace-based debugger like C++, Go, and Rust. - // "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], - - // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "vscode" -} - diff --git a/kubernetes/library-scripts/README.md b/kubernetes/library-scripts/README.md deleted file mode 100644 index d1ca195..0000000 --- a/kubernetes/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 repository's [script-library folder](https://github.com/microsoft/vscode-dev-containers/tree/main/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. diff --git a/kubernetes/library-scripts/common-debian.sh b/kubernetes/library-scripts/common-debian.sh deleted file mode 100755 index 638036c..0000000 --- a/kubernetes/library-scripts/common-debian.sh +++ /dev/null @@ -1,403 +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. -#------------------------------------------------------------------------------------------------------------- -# -# 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"} -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 - -# 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 clean - apt-get update - else - apt-get clean - apt-get update - 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 \ - dirmngr \ - 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-ust[0-9] \ - 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 - # Handle bullseye location for security https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html - sed -i "s/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main contrib non-free/" /etc/apt/sources.list - sed -i "s/deb-src http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security main/deb http:\/\/security\.debian\.org\/debian-security ${VERSION_CODENAME}-security 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 - -# ** 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 "$@" -else - echo '\n"systemd" is not running in this container due to its overhead.\nUse the "service" command to start services instead. 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='`\ - if [ "$(git config --get codespaces-theme.hide-status 2>/dev/null)" != 1 ]; then \ - 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; \ - 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 config --get codespaces-theme.hide-status 2>/dev/null)" != 1 ] && git_prompt_info)' # Git status - PROMPT+='%{$fg[white]%}$ %{$reset_color%}' - 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 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}:${group_name} "${user_rc_path}/.bashrc" - RC_SNIPPET_ALREADY_ADDED="true" -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}:${group_name} "${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!" diff --git a/node/Dockerfile.node b/node/Dockerfile.node index 4e6f258..40dc030 100644 --- a/node/Dockerfile.node +++ b/node/Dockerfile.node @@ -39,7 +39,29 @@ COPY resources/common_debian.sh /tmp/common_debian.sh RUN apt update && bash /tmp/common_debian.sh "true" "${USERNAME}" "${USER_UID}" "${USER_GID}" "true" "true" "true" \ && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* -COPY resources/post_install.sh /usr/local/share/post_install.sh -RUN chmod +X /usr/local/share/post_install.sh +COPY resources/library-scripts/*.sh /tmp/library-scripts/ -ENTRYPOINT [ "/usr/local/share/post_install.sh" ] +RUN apt-get update \ + && /bin/bash /tmp/library-scripts/docker-debian.sh "true" "/var/run/docker-host.sock" "/var/run/docker.sock" "${USERNAME}" "${USE_MOBY}" \ + && /bin/bash /tmp/library-scripts/kubectl-helm-debian.sh "latest" "latest" "none" \ + && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/ + +# Script copies localhost's ~/.kube/config file into the container and swaps out +# localhost for host.docker.internal on bash/zsh start to keep them in sync. +COPY resources/copy-kube-config.sh /usr/local/share/ +RUN chown ${USERNAME}:root /usr/local/share/copy-kube-config.sh \ + && echo "source /usr/local/share/copy-kube-config.sh" | tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc + +# [Optional] Uncomment this section to install additional OS packages. +RUN apt update \ + && apt -y install --no-install-recommends kubectx make wget + +COPY resources/install_k9s.sh ./install_k9s.sh + +RUN /bin/bash install_k9s.sh + +# Setting the ENTRYPOINT to docker-init.sh will configure non-root access to +# the Docker socket if "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" ] diff --git a/python/Dockerfile.python b/python/Dockerfile.python index 0ce6186..4292fe8 100644 --- a/python/Dockerfile.python +++ b/python/Dockerfile.python @@ -42,7 +42,29 @@ COPY resources/common_debian.sh /tmp/common_debian.sh RUN apt update && bash /tmp/common_debian.sh "true" "${USERNAME}" "${USER_UID}" "${USER_GID}" "true" "true" "true" \ && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* -COPY resources/post_install.sh /usr/local/share/post_install.sh -RUN chmod +X /usr/local/share/post_install.sh +COPY resources/library-scripts/*.sh /tmp/library-scripts/ -ENTRYPOINT [ "/usr/local/share/post_install.sh" ] +RUN apt-get update \ + && /bin/bash /tmp/library-scripts/docker-debian.sh "true" "/var/run/docker-host.sock" "/var/run/docker.sock" "${USERNAME}" "${USE_MOBY}" \ + && /bin/bash /tmp/library-scripts/kubectl-helm-debian.sh "latest" "latest" "none" \ + && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/ + +# Script copies localhost's ~/.kube/config file into the container and swaps out +# localhost for host.docker.internal on bash/zsh start to keep them in sync. +COPY resources/copy-kube-config.sh /usr/local/share/ +RUN chown ${USERNAME}:root /usr/local/share/copy-kube-config.sh \ + && echo "source /usr/local/share/copy-kube-config.sh" | tee -a /root/.bashrc /root/.zshrc /home/${USERNAME}/.bashrc >> /home/${USERNAME}/.zshrc + +# [Optional] Uncomment this section to install additional OS packages. +RUN apt update \ + && apt -y install --no-install-recommends kubectx make wget + +COPY resources/install_k9s.sh ./install_k9s.sh + +RUN /bin/bash install_k9s.sh + +# Setting the ENTRYPOINT to docker-init.sh will configure non-root access to +# the Docker socket if "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" ] diff --git a/kubernetes/library-scripts/docker-debian.sh b/resources/docker-debian.sh similarity index 100% rename from kubernetes/library-scripts/docker-debian.sh rename to resources/docker-debian.sh diff --git a/kubernetes/install_k9s.sh b/resources/install_k9s.sh similarity index 100% rename from kubernetes/install_k9s.sh rename to resources/install_k9s.sh diff --git a/kubernetes/library-scripts/kubectl-helm-debian.sh b/resources/kubectl-helm-debian.sh similarity index 100% rename from kubernetes/library-scripts/kubectl-helm-debian.sh rename to resources/kubectl-helm-debian.sh