diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f1aaff1..62adea7 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -16,61 +16,6 @@ env: GOSU_VERSION: "1.14" jobs: - build_push_before_python38: - runs-on: ubuntu-latest - permissions: - contents: write - packages: write - strategy: - matrix: - os: [almalinux8, alpine, ubuntu] - version: [v2.11] - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Prepare - id: prep - run: | - cp requirements/${MATRIX_VERSION}/requirements.txt requirements/requirements.txt - TAGS="${IMAGE_NAME}:${MATRIX_VERSION}-${MATRIX_OS}" - - # Conditional logic for additional tags - if [[ "$MATRIX_OS" == "$LATEST_OS" ]]; then - TAGS="${TAGS},${IMAGE_NAME}:${MATRIX_VERSION}" - elif [[ "$MATRIX_OS" == "almalinux8" && "$MATRIX_VERSION" == "v2.11" ]]; then - TAGS="${TAGS},${IMAGE_NAME}:latest-${MATRIX_OS}" - fi - - echo "::set-output name=tags::${TAGS}" - echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ') - env: - MATRIX_OS: ${{ matrix.os }} - MATRIX_VERSION: ${{ matrix.version }} - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.6.1 - - - name: Log into registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - - - name: Build and Push - uses: docker/build-push-action@v6 - with: - labels: | - org.opencontainers.image.created=${{ steps.prep.outputs.created }} - org.opencontainers.image.source=${{ github.repositoryUrl }} - org.opencontainers.image.version=${{ matrix.version }} - org.opencontainers.image.revision=${{ github.sha }} - org.opencontainers.image.licenses=${{ github.event.repository.license.name }} - build-args: | - docker_version=${{ env.DOCKER_CLI_VERSION }} - gosu_version=${{ env.GOSU_VERSION }} - context: . - file: ./Dockerfile.${{ matrix.os }} - tags: ${{ steps.prep.outputs.tags }} - push: true - build_push_python38_and_later: needs: build_push_before_python38 runs-on: ubuntu-latest @@ -80,7 +25,7 @@ jobs: strategy: matrix: os: [alpine, ubuntu] - version: [v2.12, v2.13,v2.15, v2.16] + version: [v2.15, v2.16] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/README.md b/README.md index e9479be..bdc46f5 100644 --- a/README.md +++ b/README.md @@ -12,26 +12,14 @@ If you find bugs or got improvements of the container, feel free to submit it [h ## Simple Tags -- `v2.13-alpine` -- `v2.13-ubuntu` -- `v2.12-alpine` -- `v2.12-ubuntu` -- `v2.11-almalinux8` -- `v2.11-alpine` -- `v2.11-ubuntu` +- `v2.15-alpine` +- `v2.15-ubuntu` +- `v2.15-almalinux8` ## Shared Tags -- `v2.13`, `latest-alpine`, `latest` - - `v2.13-alpine` -- `v2.12` - - `v2.12-alpine` -- `v2.11` - - `v2.11-alpine` -- `latest-almalinux8` - - `v2.11-almalinux8` -- `latest-ubuntu` - - `v2.13-ubuntu` +- `v2.15`, `latest-alpine`, `latest` + - `v2.15-alpine` ## Additions diff --git a/requirements/v2.11/requirements.txt b/requirements/v2.11/requirements.txt deleted file mode 100644 index 81516f8..0000000 --- a/requirements/v2.11/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -ansible-core==2.11.12 diff --git a/requirements/v2.12/requirements.txt b/requirements/v2.12/requirements.txt deleted file mode 100644 index 90411ad..0000000 --- a/requirements/v2.12/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -ansible-core==2.12.7 diff --git a/requirements/v2.13/requirements.txt b/requirements/v2.13/requirements.txt deleted file mode 100644 index 26f2c9a..0000000 --- a/requirements/v2.13/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -ansible-core==2.13.13 -mitogen==0.3.9