From 92cd7dfc4fa47c0488cebaa2c0ccc46f5d824c63 Mon Sep 17 00:00:00 2001 From: Martin Belanger Date: Mon, 6 Apr 2026 15:38:20 -0400 Subject: [PATCH] doc: remove Docker support artifacts Docker/container deployment is not a supported use case for nvme-stas, as documented in CONTAINERS.md. Remove the Dockerfile, docker-compose.yml, .dockerignore, the two disabled Docker workflows, the hadolint job from linters.yml, and the docker ecosystem entry from dependabot.yml. Signed-off-by: Martin Belanger --- .dockerignore | 3 - .github/dependabot.yml | 4 -- .github/workflows/docker-publish.yml.disabled | 63 ------------------- .github/workflows/docker-test.yml.disabled | 53 ---------------- .github/workflows/linters.yml | 11 ---- Dockerfile | 13 ---- docker-compose.yml | 27 -------- 7 files changed, 174 deletions(-) delete mode 100644 .dockerignore delete mode 100644 .github/workflows/docker-publish.yml.disabled delete mode 100644 .github/workflows/docker-test.yml.disabled delete mode 100644 Dockerfile delete mode 100644 docker-compose.yml diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 4a9bdf7..0000000 --- a/.dockerignore +++ /dev/null @@ -1,3 +0,0 @@ -.git -.github -.build diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a01ffda..1d2bd31 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,10 +5,6 @@ updates: directory: "/" schedule: interval: "weekly" - - package-ecosystem: "docker" - directory: "/" - schedule: - interval: "weekly" - package-ecosystem: "pip" directory: "/" schedule: diff --git a/.github/workflows/docker-publish.yml.disabled b/.github/workflows/docker-publish.yml.disabled deleted file mode 100644 index ca5d24f..0000000 --- a/.github/workflows/docker-publish.yml.disabled +++ /dev/null @@ -1,63 +0,0 @@ -name: Docker - -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -on: - push: - branches: [ main ] - # Publish semver tags as releases. - tags: [ 'v*.*.*' ] - pull_request: - branches: [ main ] - - workflow_dispatch: - -env: - # Use docker.io for Docker Hub if empty - REGISTRY: ghcr.io - # github.repository as / - IMAGE_NAME: ${{ github.repository }} - - -jobs: - docker-publish: - if: ${{ !github.event.act }} # skip during local actions testing - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Login against a Docker registry except on PR - # https://github.com/docker/login-action - - name: Log into registry ${{ env.REGISTRY }} - if: github.event_name != 'pull_request' - uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Extract metadata (tags, labels) for Docker - # https://github.com/docker/metadata-action - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@dbef88086f6cef02e264edb7dbf63250c17cef6c - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - # Build and push Docker image with Buildx (don't push on PR) - # https://github.com/docker/build-push-action - - name: Build and push Docker image - uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/docker-test.yml.disabled b/.github/workflows/docker-test.yml.disabled deleted file mode 100644 index 42a871c..0000000 --- a/.github/workflows/docker-test.yml.disabled +++ /dev/null @@ -1,53 +0,0 @@ -name: Test - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - - workflow_dispatch: - -jobs: - docker-run: - if: ${{ !github.event.act }} # skip during local actions testing - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Install requirements - # make sure nvme-cli installed (we need it for /etc/nvme/hostnqn and /etc/nvme/hostid) - run: | - sudo apt update - sudo apt-get install --yes --quiet nvme-cli - - - name: Load Kernel drivers - run: sudo modprobe -v nvme-fabrics - - - name: Fix D-BUS - run: | - sed 's/@STAFD_DBUS_NAME@/org.nvmexpress.staf/g' etc/dbus-1/system.d/org.nvmexpress.staf.in.conf | sudo tee /usr/share/dbus-1/system.d/org.nvmexpress.staf.conf - sed 's/@STACD_DBUS_NAME@/org.nvmexpress.stac/g' etc/dbus-1/system.d/org.nvmexpress.stac.in.conf | sudo tee /usr/share/dbus-1/system.d/org.nvmexpress.stac.conf - sudo systemctl reload dbus.service - - - name: Build & Start containers - run: docker-compose -f "docker-compose.yml" up --detach --build - - - name: Run tests - run: | - docker-compose ps - docker-compose exec -T stafd stafctl ls - docker-compose exec -T stafd stafctl status - docker-compose exec -T stacd stacctl ls - docker-compose exec -T stacd stacctl status - docker-compose logs - - - name: Logs - if: failure() - run: | - docker-compose ps || true - docker-compose logs || true - - - name: Stop containers - if: always() - run: docker-compose -f "docker-compose.yml" down diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 066e1d3..29f84b9 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -10,17 +10,6 @@ on: jobs: - docker-lint: - if: ${{ !github.event.act }} # skip during local actions testing - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - uses: actions/checkout@v6 - - uses: hadolint/hadolint-action@v3.3.0 - with: - recursive: true - ignore: DL3041 - python-lint-Jammy: runs-on: ubuntu-22.04 timeout-minutes: 30 diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 1164f04..0000000 --- a/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM fedora:43 - -WORKDIR /root - -# first line for nvme-stas -# second line for libnvme -RUN dnf install -y python3-dasbus python3-pyudev python3-systemd python3-gobject meson \ - git gcc g++ cmake openssl-devel libuuid-devel json-c-devel swig python-devel meson && dnf clean all - -COPY . . -RUN meson .build && ninja -C .build && meson install -C .build - -ENTRYPOINT ["python3"] diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 4d5b384..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,27 +0,0 @@ -version: '3.7' - -x-stas: &default-stas - image: ghcr.io/linux-nvme/nvme-stas:main - build: - context: . - volumes: - - /run/dbus:/run/dbus - - /etc/nvme:/etc/nvme - privileged: true - network_mode: host - -services: - stafd: - <<: *default-stas - environment: - RUNTIME_DIRECTORY: /run/stafd - XDG_CACHE_HOME: /var/cache/stafd - PYTHONUNBUFFERED: 1 - command: -u /usr/sbin/stafd - stacd: - <<: *default-stas - environment: - RUNTIME_DIRECTORY: /run/stacd - XDG_CACHE_HOME: /var/cache/stacd - PYTHONUNBUFFERED: 1 - command: -u /usr/sbin/stacd