Merge pull request #892 from deNBI/staging

Staging

.env.in

@@ -13,7 +13,7 @@ OS_PROJECT_DOMAIN_ID=
 OS_PASSWORD=
 
 # Filebeat
-FILEBEAT_TAG=7.15.0
+FILEBEAT_TAG=7.15.1
 ELASTIC_USER=
 ELASTIC_PASSWORD=
 HOST=portal-dev.denbi.de

.github/workflows/blacked.yml

@@ -4,7 +4,7 @@ jobs:
     format:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/[email protected].4
+            - uses: actions/[email protected].5
             - name: Checking out Branch
               run: git checkout "${GITHUB_REF:11}"
             - name: black

.github/workflows/build_image.yml

@@ -8,5 +8,5 @@ jobs:
               uses: rokroskar/[email protected]
               env:
                 GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-            - uses: actions/[email protected].4
+            - uses: actions/[email protected].5
             - run: docker build --no-cache .

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/[email protected].4
+      uses: actions/[email protected].5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/master-protection.yml

@@ -14,7 +14,7 @@ jobs:
         uses: rokroskar/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
 
       - name: Check Tag
         run: |

.github/workflows/publish_docker.yml

@@ -15,7 +15,7 @@ jobs:
         uses: rokroskar/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - name: Extract branch name
         shell: bash
         run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"

.github/workflows/release_image.yml

@@ -11,7 +11,7 @@ jobs:
      - name: Get the version
        id: get_version
        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-     - uses: actions/[email protected].4
+     - uses: actions/[email protected].5
      - name: Publish to Registry
        uses: elgohr/Publish-Docker-Github-Action@master
        with:

.github/workflows/update_docker_tags.yml

@@ -14,7 +14,7 @@ jobs:
         uses: rokroskar/[email protected]
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - run: |
           python3 update_env_by_dockerfile.py Dockerfile.update .env.in
           echo $?

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9.7-buster
+FROM python:3.10.0-buster
 RUN  apt-get update -y 
 RUN apt-get install -y build-essential
 WORKDIR /code

Dockerfile.update

@@ -1,3 +1,3 @@
 FROM denbicloud/cloud-portal-client:0.1.0-beta.0.15.1
 FROM bibiserv/bibigrid:bibigrid-rest-2.3
-FROM docker.elastic.co/beats/filebeat:7.15.0
+FROM docker.elastic.co/beats/filebeat:7.15.1

PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,7 @@
 Try to fulfill the following points before the Pull Request is merged:
 
 - [ ] The PR is reviewed by one of the team members.
+- [ ] If a linting PR exists, it must be merged before this PR is allowed to be merged.
 - [ ] If the PR is merged in the master then a release should be be made.
 - [ ] If the new code is readable, if not it should be well commented