Skip to content

Commit

Permalink
use gardenlinux base image
Browse files Browse the repository at this point in the history
  • Loading branch information
petersutter committed Mar 11, 2024
1 parent f04ab43 commit 34cc082
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
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=nightly
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
23 changes: 11 additions & 12 deletions dockerfile-configs/common-components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,19 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- 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 @@ -42,6 +48,8 @@
provides: netcat
- name: python3-minimal
provides: python3
- name: python3-tabulate
provides: tabulate

- bash:
- name: install-security-upgrades
Expand All @@ -55,13 +63,6 @@
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 @@ -83,17 +84,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
2 changes: 0 additions & 2 deletions hacks/ghelp
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,11 @@ if ghelp_info is None:
exit(1)

apttools = retrieve_packages_info(ghelp_info["apt"], "apt", "show", "=", "\n\n" , "Package", "Version", "Description")
piptools = retrieve_packages_info(ghelp_info["pip"], "pip", "show", "==", "---", "Name", "Version", "Summary")
downloaded_tools = retrieve_downloaded_tools_info(ghelp_info["downloaded"])
hack_tools = retrieve_hacks_info()

table = []
table.extend(apttools)
table.extend(piptools)
table.extend(downloaded_tools)
table.extend(hack_tools)

Expand Down

0 comments on commit 34cc082

Please sign in to comment.