Split Docker Build to accept build args to optionally include swift support

[nlaurance-pyie]

added dockerignore for slimer build context
parametrized dockerfile

making swift support optional

nil/bandersnatch 3.9 9f730c999230 2 minutes ago 156MB
nil/bandersnatch 3.9-swift 91d50bd7103d 4 minutes ago 280MB

hopefully addressing #740 also

[codecov]

Codecov Report

Merging #741 (6a2bce4) into master (446e26c) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #741   +/-   ##
=======================================
  Coverage   79.90%   79.90%           
=======================================
  Files          15       15           
  Lines        2140     2140           
  Branches      311      311           
=======================================
  Hits         1710     1710           
  Misses        320      320           
  Partials      110      110           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 446e26c...6a2bce4. Read the comment docs.

[cooperlees]

Looks good, but I think it's going to break automation.

2 questions:

1. How des this remove the setuptools dep? We use import from it
   e.g. filter.py + storage.py import pkg_resources

• https://github.com/pypa/bandersnatch/blob/master/src/bandersnatch/filter.py#L7
• https://github.com/pypa/bandersnatch/blob/master/src/bandersnatch/storage.py#L25

2. I feel this will need to pass this arg to the docker building GitHub action

• Seems you just need to add buildargs: PY_VERSION=3.9 to https://github.com/pypa/bandersnatch/blob/master/.github/workflows/docker_upload.yml

[cooperlees]

Sweet - 1 spot is way better!

[nlaurance-pyie]

1/ poor phrasing, sorry. it's just out from requirements and setup. Still needed tho. its presence triggered warning

[nlaurance-pyie]

! refs/heads/docker_py_version:refs/heads/docker_py_version [remote rejected] (refusing to allow an OAuth App to create or update workflow .github/workflows/docker_upload.ymlwithoutworkflow scope)

name: bandersnatch_docker_upload

on:
  push:
    branches:
      - master

jobs:
  build:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@master
      - name: Publish to Docker Registry
        uses: elgohr/Publish-Docker-Github-Action@master
        env:
          PY_VERSION: 3.9
        with:
          name: pypa/bandersnatch
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
          snapshot: true
          buildargs: PY_VERSION
          tags: "swift-latest, swift-3.9, swift-3"
      - name: Publish Swift variation to Docker Registry
        uses: elgohr/Publish-Docker-Github-Action@master
        env:
          PY_VERSION: 3.9
          WITH_SWIFT: yes
        with:
          name: pypa/bandersnatch
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}
          snapshot: true
          buildargs: PY_VERSION, WITH_SWIFT
          tags: "latest, 3.9, 3"

[cooperlees]

1/ poor phrasing, sorry. it's just out from requirements and setup. Still needed tho. its presence triggered warning

What warning? Seems weird to remove something we know is a dep. If you can't work it out can you leave it and open an issue and I'll try fix it.

! refs/heads/docker_py_version:refs/heads/docker_py_version [remote rejected] (refusing to allow an OAuth App to create or update workflow .github/workflows/docker_upload.ymlwithoutworkflow scope)

What's this? Do I need to do something here?

[nlaurance-pyie]

1/ issue is similar to pypa/pipenv#1417 (setuptools shouldn't be a dependency since you cannot install dependencies without it in the first place)
now, I don't mind to put it back

the other matter is it seems I cannot push any changes in the .github repo. And you would need to evaluate my changes yourself, I'm afraid. It makes the image without swift support the standard one, and also build a variation with the optional swift support.

[cooperlees]

Really, .github should just checkout like any other directory. Worst comes to worst I can look at merging your changes, but there is no protection to the .github directory that I know of.

[nlaurance-pyie]

.github is checked out alright, but I can't push .
it seems a security feature.

Also, that Dockerfile doesn't build on raspberry pi ;(

[cooperlees]

TIL. Ok, well I can fix that post merging this.

Raspberry Pi has never been a target platform. File an issue with the errors + a repro and I or someone else will see if we can fix it.

[cooperlees]

Please fix lint:

Fix End of Files.........................................................Failed
- hook id: end-of-file-fixer
- exit code: 1
- files were modified by this hook
Fixing MAINTAINERS.md
Fixing .dockerignore

[cooperlees]

I'm looking to release this week so if you could fix the lints + put setuptools back so we can see what version we test with and what version each release / docker container uses that would be grand.

[cooperlees]

Thanks. Will merge soon when I have time to fix the docker image building etc. right after merging.

[cooperlees]

This still build and uploaded a docker image:
https://github.com/pypa/bandersnatch/runs/1471070904

Will try a PR with your suggested changes tho.