cleanup

.github/workflows/build-and-publish.yml

@@ -1,42 +0,0 @@
-name: Build and Publish
-
-on:
-  push:
-    branches:
-      - 'main'
-    tags:
-      - 'v*'
-  pull_request:
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ghcr.io/${{ github.repository }}
-
-      - name: Login to Github Packages
-        uses: docker/login-action@v1
-        if: github.event_name != 'pull_request'
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          push: ${{ github.event_name != 'pull_request'}}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -1,12 +1,13 @@
 .env
-static/css/font-awesome.min.css
+.venv
-static/js/bootstrap.bundle.min.js
+source/static/css/font-awesome.min.css
-static/js/jquery.min.js
+source/static/js/bootstrap.bundle.min.js
-static/js/vue.min.js
+source/static/js/jquery.min.js
-static/js/axios.min.js
+source/static/js/vue.min.js
-static/fonts
+source/static/js/axios.min.js
+source/static/fonts
 
-staticfiles
+source/staticfiles
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

.travis.yml

@@ -1,10 +0,0 @@
-language: python
-python:
-  - "3.7"
-  - "3.8"
-install:
-  - pip install -r requirements.txt
-  - pip install flake8
-script:
-  - flake8
-  - ./manage.py test

Dockerfile

@@ -9,7 +9,7 @@ ENV PYTHONUNBUFFERED 1
 RUN apk add --no-cache postgresql-dev gcc python3-dev musl-dev gettext postgresql-client nginx supervisor
 
 # install dependencies
-ADD ./requirements.txt .
+ADD ./source/requirements.txt .
 RUN pip install -r requirements.txt
 
 # add supervisor and nginx configs
@@ -20,7 +20,7 @@ ADD ./docker/supervisord.conf /etc/supervisord.conf
 RUN addgroup -S portier && adduser -S portier -G portier
 
 # add code
-ADD --chown=portier:portier . /app
+ADD --chown=portier:portier ./source/ /app/
 
 # add static external libraries for frontend
 RUN ./fetch_frontend_libs.sh \

docker-compose.yaml

@@ -37,4 +37,4 @@ services:
       - 1935:1935
       - 8888:8888
     volumes:
-      - ./srs.dev.conf:/usr/local/srs/conf/docker.conf:ro
+      - ./srs.conf:/usr/local/srs/conf/docker.conf:ro