diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml index 95bbf62e4..5883ca2d5 100644 --- a/.github/actions/package/action.yml +++ b/.github/actions/package/action.yml @@ -27,11 +27,14 @@ inputs: sign: description: Wether to sign the package or not default: "" - artifactory_username: - description: The artifactory username + registry_url: + description: Docker registry url required: true - artifactory_password: - description: The artifactory password + registry_username: + description: Docker registry username + required: true + registry_password: + description: Docker registry password required: true runs: @@ -41,9 +44,9 @@ runs: - name: Login to Registry uses: docker/login-action@v2 with: - registry: docker.centreon.com - username: ${{ inputs.artifactory_username }} - password: ${{ inputs.artifactory_password }} + registry: ${{ inputs.registry_url }} + username: ${{ inputs.registry_username }} + password: ${{ inputs.registry_password }} - name: Package uses: ./.github/actions/runner-docker @@ -51,8 +54,9 @@ runs: script_name: ${{ inputs.script_name }} image_name: ${{ inputs.image_name }} image_version: latest - artifactory_username: ${{ inputs.artifactory_username }} - artifactory_password: ${{ inputs.artifactory_password }} + registry_url: ${{ inputs.registry_url }} + registry_username: ${{ inputs.registry_username }} + registry_password: ${{ inputs.registry_password }} params: ${{ inputs.version }} ${{ inputs.release }} "${{ inputs.plugins }}" - name: Sign @@ -62,8 +66,9 @@ runs: script_name: rpm-signing image_name: rpm-signing image_version: ubuntu - artifactory_username: ${{ inputs.artifactory_username }} - artifactory_password: ${{ inputs.artifactory_password }} + registry_url: ${{ inputs.registry_url }} + registry_username: ${{ inputs.registry_username }} + registry_password: ${{ inputs.registry_password }} - name: Cache packaged files uses: actions/cache@v3 diff --git a/.github/actions/runner-docker/action.yml b/.github/actions/runner-docker/action.yml index e0951f4e9..b457eee72 100644 --- a/.github/actions/runner-docker/action.yml +++ b/.github/actions/runner-docker/action.yml @@ -13,11 +13,14 @@ inputs: centreon_pat: description: "Secret" required: false - artifactory_username: - description: The artifactory username + registry_url: + description: Docker registry url required: true - artifactory_password: - description: The artifactory password + registry_username: + description: Docker registry username + required: true + registry_password: + description: Docker registry password required: true params: description: "params for script" @@ -28,9 +31,9 @@ runs: - name: Login to Registry (via runner) uses: docker/login-action@v2 with: - registry: docker.centreon.com - username: ${{ inputs.artifactory_username }} - password: ${{ inputs.artifactory_password }} + registry: ${{ inputs.registry_url }} + username: ${{ inputs.registry_username }} + password: ${{ inputs.registry_password }} - - run: docker run -i -e TOKEN=${{ inputs.centreon_pat }} --entrypoint /src/.github/scripts/${{ inputs.script_name }}.sh -v "$PWD:/src" docker.centreon.com/${{ inputs.image_name }}:${{ inputs.image_version }} ${{ inputs.params }} + - run: docker run -i -e TOKEN=${{ inputs.centreon_pat }} --entrypoint /src/.github/scripts/${{ inputs.script_name }}.sh -v "$PWD:/src" ${{ inputs.registry_url }}/${{ inputs.image_name }}:${{ inputs.image_version }} ${{ inputs.params }} shell: bash diff --git a/.github/docker/Dockerfile.packaging-plugins-alma8 b/.github/docker/Dockerfile.packaging-plugins-alma8 index 517f727b1..5e162edb8 100644 --- a/.github/docker/Dockerfile.packaging-plugins-alma8 +++ b/.github/docker/Dockerfile.packaging-plugins-alma8 @@ -1,4 +1,6 @@ -FROM docker-proxy.centreon.com/almalinux:8 +ARG REGISTRY_URL + +FROM ${REGISTRY_URL}/almalinux:8 RUN <