diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cbe89ca..a4d5174 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: test: strategy: matrix: - image: [ ubuntu, ubuntu-14.04, alpine, debian, amazonlinux, centos7, rockylinux8, rockylinux9, fedora] + image: [ ubuntu, ubuntu-14.04, alpine, debian, amazonlinux, rockylinux8, rockylinux9, fedora] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/README.md b/README.md index 55c6dd8..fb6b614 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This is a script to automate [Oh My Zsh](https://ohmyz.sh/) installation in development containers. -Works with any image based on Alpine, Ubuntu, Debian, Amazon Linux, CentOS 7, RockyLinux 8,9 and Fedora. +Works with any image based on Alpine, Ubuntu, Debian, Amazon Linux, RockyLinux 8,9 and Fedora. The original goal was to simplify setting up `zsh` and Oh My Zsh in a Docker image for use with [VSCode's Remote Containers extension](https://code.visualstudio.com/docs/remote/containers), but it can be used whenever you diff --git a/docker-compose.yml b/docker-compose.yml index 3e59e47..b626f24 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,11 +31,6 @@ services: entrypoint: /bin/sh command: -c "while sleep 1000; do :; done" - test-centos7: - image: centos:7 - entrypoint: /bin/sh - command: -c "while sleep 1000; do :; done" - test-rockylinux8: image: rockylinux:8 entrypoint: /bin/sh diff --git a/test.sh b/test.sh index a758343..198c59b 100755 --- a/test.sh +++ b/test.sh @@ -43,7 +43,7 @@ test_suite() { docker compose stop -t 1 test-$image_name } -images=${*:-"alpine ubuntu ubuntu-14.04 debian amazonlinux centos7 rockylinux8 rockylinux9 fedora"} +images=${*:-"alpine ubuntu ubuntu-14.04 debian amazonlinux rockylinux8 rockylinux9 fedora"} for image in $images; do test_suite $image diff --git a/zsh-in-docker.sh b/zsh-in-docker.sh index ccaf357..c022b9a 100755 --- a/zsh-in-docker.sh +++ b/zsh-in-docker.sh @@ -94,7 +94,7 @@ install_dependencies() { $Sudo yum install -y git zsh $Sudo yum install -y ncurses-compat-libs # this is required for AMZN Linux (ref: https://github.com/emqx/emqx/issues/2503) ;; - rhel|fedora|centos|rocky) + rhel|fedora|rocky) $Sudo yum update -y $Sudo yum install -y git zsh ;;