towards #25

.github/workflows/deploy.yml

@@ -0,0 +1,25 @@
+name: Publish and Deploy
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: docker build
+        run: docker build -t acdhch/vocabseditor .
+      - name: docker push
+        run: |
+          docker login -u "${{ secrets.DOCKER_USERNAME }}" -p "${{ secrets.DOCKER_PASSWORD }}" 
+          docker push acdhch/vocabseditor
+  rancher:
+     needs: push_to_registry
+     name: Deploy to rancher
+     runs-on: ubuntu-latest
+     steps:
+     - name: Rancher Deploy Action
+       run: "docker run --rm curlimages/curl:7.74.0  --request POST 'https://rancher.acdh-dev.oeaw.ac.at/v3/project/c-zdbh8:p-44gl8/workloads/deployment:vocabseditor:vocabsmanual?action=redeploy' --header 'Accept: application/json' --header 'Authorization: Bearer ${{ secrets.RANCHER_BARER_TOKEN }}'"

.github/workflows/test-app.yml

@@ -1,4 +1,4 @@
-name: Test and Publish
+name: Test
 
 on:
   push:
@@ -36,23 +36,4 @@ jobs:
       run: |
         python manage.py makemigrations --settings=vocabseditor.settings.dev
         python manage.py migrate --settings=vocabseditor.settings.dev
-        python manage.py test --settings=vocabseditor.settings.dev
-  push_to_registry:
-    needs: test
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: docker build
-        run: docker build -t acdhch/vocabseditor .
-      - name: docker push
-        run: |
-          docker login -u "${{ secrets.DOCKER_USERNAME }}" -p "${{ secrets.DOCKER_PASSWORD }}" 
-          docker push acdhch/vocabseditor
-  rancher:
-     needs: push_to_registry
-     name: Deploy to rancher
-     runs-on: ubuntu-latest
-     steps:
-     - name: Rancher Deploy Action
-       run: "docker run --rm curlimages/curl:7.74.0  --request POST 'https://rancher.acdh-dev.oeaw.ac.at/v3/project/c-zdbh8:p-44gl8/workloads/deployment:vocabseditor:vocabsmanual?action=redeploy' --header 'Accept: application/json' --header 'Authorization: Bearer ${{ secrets.RANCHER_BARER_TOKEN }}'"
+        python manage.py test --settings=vocabseditor.settings.dev

Dockerfile

@@ -1,7 +1,11 @@
-FROM csae8092/djangobaseimage
+FROM python:3.8-buster
+
 
-# install nginx
 RUN apt-get update -y && apt-get upgrade -y
+RUN apt-get install nginx vim postgresql-common libpq-dev python3-gdal -y
+RUN ln -sf /dev/stdout /var/log/nginx/access.log \
+    && ln -sf /dev/stderr /var/log/nginx/error.log
+
 COPY nginx.default /etc/nginx/sites-available/default
 
 # copy source and install dependencies