Skip to content

Commit

Permalink
feat(onedir): remove extra package python3-pip (RedHat-based)
Browse files Browse the repository at this point in the history
  • Loading branch information
@myii
myii committed Dec 10, 2022
1 parent 946d805 commit 1721fd8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
28 changes: 14 additions & 14 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,16 +262,16 @@ commitlint:

# yamllint disable rule:commas rule:line-length
# ALMALINUX
alma-08.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'almalinux' , DV: '8' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
alma-08.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'almalinux' , DV: '8' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel python3-pip swig'}}
alma-08.0-nghtly-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'almalinux' , DV: '8' , PI: 'yum', SIM: 'onedir', SV: 'nightly', SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
alma-08.0-3005.1-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'almalinux' , DV: '8' , PI: 'yum', SIM: 'onedir', SV: '3005.1' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
alma-08.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'almalinux' , DV: '8' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
alma-08.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'almalinux' , DV: '8' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel python3-pip swig'}}

# AMAZONLINUX
amaz-02.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'amazonlinux' , DV: '2' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'procps-ng yum-utils'}}
amaz-02.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'amazonlinux' , DV: '2' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'procps-ng python3-pip yum-utils'}}
amaz-02.0-nghtly-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'amazonlinux' , DV: '2' , PI: 'yum', SIM: 'onedir', SV: 'nightly', SVB: '' , PV: '3', EP: 'procps-ng yum-utils'}}
amaz-02.0-3005.1-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'amazonlinux' , DV: '2' , PI: 'yum', SIM: 'onedir', SV: '3005.1' , SVB: '' , PV: '3', EP: 'procps-ng yum-utils'}}
amaz-02.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'amazonlinux' , DV: '2' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'procps-ng yum-utils'}}
amaz-02.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'amazonlinux' , DV: '2' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'procps-ng python3-pip yum-utils'}}

# ARCHLINUX
# Latest stable release (can flag out-of-date from this page): https://archlinux.org/packages/community/any/salt/
Expand All @@ -280,16 +280,16 @@ arch-late-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN
arch-late-3005.1-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'archlinux/archlinux' , DV: 'latest' , PI: 'pac', SIM: 'stable', SV: '3005.1' , SVB: 'latest', PV: '3', EP: 'python-jmespath python-psutil'}}

# CENTOS (STREAM)
cstr-08.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'quay.io/centos/centos', DV: 'stream8', PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
cstr-08.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'quay.io/centos/centos', DV: 'stream8', PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel python3-pip swig'}}
cstr-08.0-nghtly-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'quay.io/centos/centos', DV: 'stream8', PI: 'yum', SIM: 'onedir', SV: 'nightly', SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
cstr-08.0-3005.1-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'quay.io/centos/centos', DV: 'stream8', PI: 'yum', SIM: 'onedir', SV: '3005.1' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
cstr-08.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'quay.io/centos/centos', DV: 'stream8', PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
cstr-08.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'quay.io/centos/centos', DV: 'stream8', PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel procps-ng python3 python3-devel python3-pip swig'}}

# CENTOS
cent-07.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'centos' , DV: '7' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel swig zeromq zeromq-devel'}}
cent-07.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'centos' , DV: '7' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel python3-pip swig zeromq zeromq-devel'}}
cent-07.0-nghtly-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'centos' , DV: '7' , PI: 'yum', SIM: 'onedir', SV: 'nightly', SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel swig zeromq zeromq-devel'}}
cent-07.0-3005.1-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'centos' , DV: '7' , PI: 'yum', SIM: 'onedir', SV: '3005.1' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel swig zeromq zeromq-devel'}}
cent-07.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'centos' , DV: '7' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel swig zeromq zeromq-devel'}}
cent-07.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'centos' , DV: '7' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel python3-pip swig zeromq zeromq-devel'}}

# DEBIAN
# debi-12.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'debian' , DV: '12' , PI: 'apt', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'python3-apt python3-pip'}}
Expand Down Expand Up @@ -347,20 +347,20 @@ opsu-15.3-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN
opsu-15.3-3004.0-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'opensuse/leap' , DV: '15.3' , PI: 'zyp', SIM: 'stable', SV: '3004.0' , SVB: 'latest', PV: '3', EP: ''}}

# ORACLELINUX
orac-08.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '8' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel python3 python3-devel swig'}}
orac-08.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '8' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel python3 python3-devel python3-pip swig'}}
orac-08.0-nghtly-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '8' , PI: 'yum', SIM: 'onedir', SV: 'nightly', SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel python3 python3-devel swig'}}
orac-08.0-3005.1-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '8' , PI: 'yum', SIM: 'onedir', SV: '3005.1' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel python3 python3-devel swig'}}
orac-08.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '8' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel python3 python3-devel swig'}}
orac-07.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '7' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel swig zeromq zeromq-devel'}}
orac-08.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '8' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'glibc-langpack-en openssl-devel python3 python3-devel python3-pip swig'}}
orac-07.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '7' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel python3-pip swig zeromq zeromq-devel'}}
orac-07.0-nghtly-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '7' , PI: 'yum', SIM: 'onedir', SV: 'nightly', SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel swig zeromq zeromq-devel'}}
orac-07.0-3005.1-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '7' , PI: 'yum', SIM: 'onedir', SV: '3005.1' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel swig zeromq zeromq-devel'}}
orac-07.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '7' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel swig zeromq zeromq-devel'}}
orac-07.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'oraclelinux' , DV: '7' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'gcc-g++ openssl-devel python3 python3-devel python3-pip swig zeromq zeromq-devel'}}

# ROCKYLINUX
rock-08.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'rockylinux' , DV: '8' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'findutils glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
rock-08.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'rockylinux' , DV: '8' , PI: 'yum', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'findutils glibc-langpack-en openssl-devel procps-ng python3 python3-devel python3-pip swig'}}
rock-08.0-nghtly-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'rockylinux' , DV: '8' , PI: 'yum', SIM: 'onedir', SV: 'nightly', SVB: '' , PV: '3', EP: 'findutils glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
rock-08.0-3005.1-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'rockylinux' , DV: '8' , PI: 'yum', SIM: 'onedir', SV: '3005.1' , SVB: '' , PV: '3', EP: 'findutils glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
rock-08.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'rockylinux' , DV: '8' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'findutils glibc-langpack-en openssl-devel procps-ng python3 python3-devel swig'}}
rock-08.0-3004.2-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'rockylinux' , DV: '8' , PI: 'yum', SIM: 'stable', SV: '3004.2' , SVB: '' , PV: '3', EP: 'findutils glibc-langpack-en openssl-devel procps-ng python3 python3-devel python3-pip swig'}}

# UBUNTU
ubun-22.0-master-py3: {extends: '.build_image_failure_forbidden', variables: {DN: 'ubuntu' , DV: '22.04' , PI: 'apt', SIM: 'git' , SV: 'master' , SVB: '' , PV: '3', EP: 'python3-apt python3-pip'}}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.yum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ARG EXTRA_PACKAGES=""
# These are now expected by the `ssf` customised `kitchen-docker` being used:
# - https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker/-/compare/master...ssf
ARG KITCHEN_DOCKER_PACKAGES="curl openssh-clients openssh-server sudo which"
ARG PKGS="${KITCHEN_DOCKER_PACKAGES} git net-tools python3-pip systemd udev ${EXTRA_PACKAGES}"
ARG PKGS="${KITCHEN_DOCKER_PACKAGES} git net-tools systemd udev ${EXTRA_PACKAGES}"
ARG SALT_REPO_URL=""

SHELL ["/bin/bash", "-x", "-o", "pipefail", "-c"]
Expand Down

0 comments on commit 1721fd8

Please sign in to comment.