Python and various other Updates/Fixes #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

rbartl wants to merge 33 commits into dcai:master from BiP-org:master

.dockerignore

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		**/.git
		*~

.github/workflows/ghcr-publish.yml

-Original file line number
+Diff line change
@@ -0,0 +1,49 @@
+    name: Create and publish a Docker image
+    # Configures this workflow to run every time a change is pushed to the branch called `release`.
+    on:
+      push:
+        branches: ['release']
+    # Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
+    env:
+      REGISTRY: ghcr.io
+      IMAGE_NAME: ${{ github.repository }}
+    # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
+    jobs:
+      build-and-push-image:
+        runs-on: ubuntu-latest
+        # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
+        permissions:
+          contents: read
+          packages: write
+        steps:
+          - name: Checkout repository
+            uses: actions/checkout@v4
+          # Uses the `docker/login-action` action to log in to the Container registry registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
+          - name: Log in to the Container registry
+            uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+            with:
+              registry: ${{ env.REGISTRY }}
+              username: ${{ github.actor }}
+              password: ${{ secrets.GITHUB_TOKEN }}
+          # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
+          - name: Extract metadata (tags, labels) for Docker
+            id: meta
+            uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+            with:
+              images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          # This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
+          # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
+          # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
+          - name: Build and push Docker image
+            uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+            with:
+              context: .
+              push: true
+              tags: ${{ steps.meta.outputs.tags }}
+              labels: ${{ steps.meta.outputs.labels }}

.github/workflows/pythonapp.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,10 +9,10 @@ jobs:
  
        steps:

        - uses: actions/checkout@v1

        - name: Set up Python 3.8

        - name: Set up Python 3.11.13

          uses: actions/setup-python@v1

          with:

            python-version: 3.8

            python-version: 3.11.13

        - name: Install dependencies

          run: |

            python -m pip install --upgrade pip

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,7 @@ airnotifier.err @@
     airnotifier.log
     config.py
     .cache
+    mongo/
+    logs/
+    *~
+    .env

Dockerfile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,16 +1,26 @@
  
    FROM python:3.6

    FROM python:3.11

    ENV LANG C.UTF-8

    ENV LC_ALL C.UTF-8

    ENV DEBIAN_FRONTEND=noninteractive TERM=linux

    ENV PYTHONDONTWRITEBYTECODE 1

    ENV PYTHONUNBUFFERED 1

    EXPOSE 8801

    RUN apt-get update && \

        apt-get install -y --no-install-recommends git ca-certificates

    # Configure APT

    RUN echo "debconf debconf/frontend select ${DEBIAN_FRONTEND}" | debconf-set-selections \

        && echo 'APT::Install-Recommends "false";' | tee /etc/apt/apt.conf.d/99install-recommends \

        && echo 'APT::Get::Assume-Yes "true";' | tee /etc/apt/apt.conf.d/99assume-yes \

        && sed -Ei 's|^(DPkg::Pre-Install-Pkgs .*)|#\1|g' /etc/apt/apt.conf.d/70debconf \

        && debconf-show debconf

    RUN apt-get update -q -y && \

        apt-get install -q -y --no-install-recommends git ca-certificates python3-dev python3 python3-dns

    RUN pip3 install pipenv

    RUN git clone -b 2.x https://github.com/airnotifier/airnotifier.git /airnotifier

    COPY . /airnotifier

    RUN mkdir -p /var/airnotifier/pemdir && \

        mkdir -p /var/log/airnotifier

    @@ -21,4 +31,6 @@ RUN pipenv install --deploy
  
    ADD start.sh /airnotifier

    RUN chmod a+x /airnotifier/start.sh

    RUN chmod a+x /airnotifier/install.py

    RUN chmod a+x /airnotifier/app.py

    ENTRYPOINT /airnotifier/start.sh

Pipfile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,6 +3,9 @@ name = "pypi"
  
    url = "https://pypi.org/simple"

    verify_ssl = true

    [requires]

    python_version = "3.11"

    [scripts]

    test = "python -m unittest discover -s tests -p 'test_*.py'"

    @@ -11,12 +14,12 @@ test = "python -m unittest discover -s tests -p 'test_*.py'"
  
    [packages]

    netaddr = "==0.7.18"

    oauth2client = "==4.1.3"

    pymongo = "==3.5.1"

    pymongo = "==3.13.0"

    requests = "==2.21.0"

    tornado = "~=6.0"

    tornado = "~=6.4.0"

    click = "*"

    sentry-sdk = "==0.13.2"

    aiocontextvars = "*"

    hyper = "*"

    pyjwt = "*"

    cryptography = "*"

    httpx = "*"

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Python and various other Updates/Fixes #253

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Python and various other Updates/Fixes #253

Are you sure you want to change the base?

Uh oh!

Python and various other Updates/Fixes #253

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!