diff --git a/.github/workflows/reusable-verify.yml b/.github/workflows/reusable-verify.yml index 9ec6d59..29b38e0 100644 --- a/.github/workflows/reusable-verify.yml +++ b/.github/workflows/reusable-verify.yml @@ -7,11 +7,11 @@ on: required: true type: string description: "'runs-on'" - container: + docker_image: required: false type: string default: "" - description: container name + description: Docker image name package_installation_command: required: false type: string @@ -32,7 +32,7 @@ jobs: ssh-pem: name: Connect to github.com (PEM format) runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -50,7 +50,7 @@ jobs: ssh-pem-bitbucket: name: Connect to bitbucket.org (PEM format) runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -69,7 +69,7 @@ jobs: ssh-pkcs8: name: Connect to github.com (PKCS8 format) runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -87,7 +87,7 @@ jobs: ssh-pkcs8-bitbucket: name: Connect to bitbucket.org (PKCS8 format) runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -106,7 +106,7 @@ jobs: ssh-rfc4716: name: Connect to github.com (RFC4716 format) runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -124,7 +124,7 @@ jobs: ssh-rfc4716-bitbucket: name: Connect to bitbucket.org (RFC4716 format) runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -143,7 +143,7 @@ jobs: key_if_exists_replace-key_exists: name: if_key_exists=replace / key exists runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -167,7 +167,7 @@ jobs: key_if_exists_replace-key_doesnt_exist: name: if_key_exists=replace / key doesn't exist runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -186,7 +186,7 @@ jobs: key_if_exists_ignore-key_exists: name: if_key_exists=ignore / key exists runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -210,7 +210,7 @@ jobs: key_if_exists_ignore-key_doesnt_exist: name: if_key_exists=ignore / key doesn't exist runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -229,7 +229,7 @@ jobs: key_if_exists_fail-key_exists: name: if_key_exists=fail / key exists runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} @@ -254,7 +254,7 @@ jobs: key_if_exists_fail-key_doesnt_exist: name: if_key_exists=fail / key doesn't exist runs-on: ${{ inputs.os }} - container: ${{ inputs.container }} + container: ${{ inputs.docker_image }} steps: - name: Install packages run: ${{ inputs.package_installation_command }} diff --git a/.github/workflows/verify-on-container-alpine.yml b/.github/workflows/verify-on-container-alpine.yml index b641200..12262da 100644 --- a/.github/workflows/verify-on-container-alpine.yml +++ b/.github/workflows/verify-on-container-alpine.yml @@ -15,7 +15,7 @@ jobs: - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - container: + docker_image: - alpine:3.10 - alpine:3.11 - alpine:3.12 @@ -23,6 +23,6 @@ jobs: uses: "./.github/workflows/reusable-verify.yml" with: os: ${{ matrix.os }} - container: ${{ matrix.container }} + docker_image: ${{ matrix.docker_image }} package_installation_command: apk add openssh-client git secrets: inherit diff --git a/.github/workflows/verify-on-container-centos.yml b/.github/workflows/verify-on-container-centos.yml index fe85261..e7cf195 100644 --- a/.github/workflows/verify-on-container-centos.yml +++ b/.github/workflows/verify-on-container-centos.yml @@ -15,12 +15,12 @@ jobs: - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - container: + docker_image: - quay.io/centos/centos:centos7 - quay.io/centos/centos:stream8 uses: "./.github/workflows/reusable-verify.yml" with: os: ${{ matrix.os }} - container: ${{ matrix.container }} + docker_image: ${{ matrix.docker_image }} package_installation_command: yum install -y git openssh-clients secrets: inherit diff --git a/.github/workflows/verify-on-container-ubuntu.yml b/.github/workflows/verify-on-container-ubuntu.yml index 1a4d4ed..21c5897 100644 --- a/.github/workflows/verify-on-container-ubuntu.yml +++ b/.github/workflows/verify-on-container-ubuntu.yml @@ -15,7 +15,7 @@ jobs: - ubuntu-18.04 - ubuntu-20.04 - ubuntu-22.04 - container: + docker_image: - ubuntu:16.04 - ubuntu:18.04 - ubuntu:20.04 @@ -23,7 +23,7 @@ jobs: uses: "./.github/workflows/reusable-verify.yml" with: os: ${{ matrix.os }} - container: ${{ matrix.container }} + docker_image: ${{ matrix.docker_image }} package_installation_command: | apt update apt install -y openssh-client git