Skip to content

Commit

Permalink
Merge pull request #22 from quiknode-labs/INFRA-570
Browse files Browse the repository at this point in the history
fix: remove old ansible versions that have vulns
  • Loading branch information
Protozoan1369 authored Sep 5, 2024
2 parents 53645f9 + be90dae commit 7be09d6
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 77 deletions.
57 changes: 1 addition & 56 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]

- 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
Expand All @@ -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
Expand Down
22 changes: 5 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion requirements/v2.11/requirements.txt

This file was deleted.

1 change: 0 additions & 1 deletion requirements/v2.12/requirements.txt

This file was deleted.

2 changes: 0 additions & 2 deletions requirements/v2.13/requirements.txt

This file was deleted.

0 comments on commit 7be09d6

Please sign in to comment.