Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use gardenlinux base image #103

Merged
merged 4 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .ci/build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -eu

UBUNTU_VERSION=22.04
GARDENLINUX_VERSION=1443.0
SOURCE_PATH=${SOURCE_PATH:-}
GENERATED_DOCKERFILES_PATH=${GENERATED_DOCKERFILES_PATH:-}

Expand All @@ -15,6 +15,6 @@ fi

"${SOURCE_PATH}"/generator/generate-dockerfile.py \
--dockerfile-config "${SOURCE_PATH}"/dockerfile-configs/common-components.yaml \
--from-image "ubuntu:${UBUNTU_VERSION}" \
--from-image "ghcr.io/gardenlinux/gardenlinux:${GARDENLINUX_VERSION}" \
--title "gardener shell" \
--dockerfile "${GENERATED_DOCKERFILES_PATH}"/ops-toolbelt.dockerfile
31 changes: 12 additions & 19 deletions dockerfile-configs/common-components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@
#
# SPDX-License-Identifier: Apache-2.0

- bash:
- name: debian testing apt-source
command: |
echo "deb https://cdn-aws.deb.debian.org/debian testing main" >> /etc/apt/sources.list
info: ~

- apt-get:
- curl
- tree
- vim-tiny
- htop
- less
- locales
- tmux
- bash-completion
- python3-distutils
Expand All @@ -32,26 +39,14 @@
provides: netcat
- name: python3-minimal
provides: python3

- bash:
- name: install-security-upgrades
command: |
apt-get --yes update && apt-get -s dist-upgrade | grep "^Inst" | grep -i securi | awk -F " " {'print $2'} | xargs apt-get install;\
rm -rf /var/lib/apt/lists
info: ~
- name: python3-tabulate
provides: tabulate

- curl:
- name: yaml2json
version: v1.3
from: https://github.com/bronze1man/yaml2json/releases/download/{version}/yaml2json_linux_amd64
info: transform yaml string to json string without the type infomation.
- name: pip
from: https://bootstrap.pypa.io/pip/get-pip.py
to: /get-pip.py
command: |
python3 /get-pip.py;\
rm /get-pip.py
info: ~
- name: kubetail
from: https://raw.githubusercontent.com/johanhaleby/kubetail/master/kubetail
info: Bash script that enables you to aggregate (tail/follow) logs from multiple pods into one stream
Expand All @@ -73,17 +68,15 @@

- bash:
- name: generate_locale
command: locale-gen "en_US.UTF-8"
command: |
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen;\
locale-gen
info: ~

- env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8

- pip:
- mdv
- tabulate

- copy:
- name: dotfiles
from: ./dotfiles
Expand Down
3 changes: 3 additions & 0 deletions hacks/ghelp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ def parse_package_info(package_info, provided_binaries, name_key, version_key, i

def retrieve_packages_info(installed_tools_list, package_manager, show_command, version_delimiter, delimiter, name_key, version_key, info_key):
tools = []
if not installed_tools_list:
return tools

provided_binaries = {}
tool_names = []
for entry in installed_tools_list:
Expand Down