Merge pull request #1320 from deNBI/staging

Staging

.github/workflows/blacked.yml

@@ -4,7 +4,7 @@ jobs:
     format:
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3.1.0
+            - uses: actions/checkout@v3.2.0
             - name: Checking out Branch
               run: git checkout "${GITHUB_REF:11}"
             - name: black
@@ -17,7 +17,7 @@ jobs:
             - name: Create Pull Request
               if: steps.git-check.outputs.modified == 'true'
               id: cpr
-              uses: peter-evans/[email protected].0
+              uses: peter-evans/[email protected].3
               with:
                token: ${{ secrets.GITHUB_TOKEN }}
                commit-message: fix(Linting):blacked code

.github/workflows/build_image.yml

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

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.1.0
+      uses: actions/checkout@v3.2.0
 
     # 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/checkout@v3.1.0
+      - uses: actions/checkout@v3.2.0
 
       - 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/checkout@v3.1.0
+      - uses: actions/checkout@v3.2.0
       - 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/checkout@v3.1.0
+     - uses: actions/checkout@v3.2.0
      - name: Publish to Registry
        uses: elgohr/Publish-Docker-Github-Action@master
        with:

Dockerfile

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

VirtualMachineService/VirtualMachineHandler.py

@@ -1058,17 +1058,26 @@ def start_server_without_playbook(
                 volume_ids_path_new=volume_ids_path_new,
                 volume_ids_path_attach=volume_ids_path_attach,
             )
+            unlock_ubuntu_user_script = "\npasswd -u ubuntu\n"
+            unlock_ubuntu_user_script = encodeutils.safe_encode(
+                unlock_ubuntu_user_script.encode("utf-8")
+            )
             if additional_keys:
                 if init_script:
                     add_key_script = self.create_add_keys_script(keys=additional_keys)
                     init_script = (
                         add_key_script
                         + encodeutils.safe_encode("\n".encode("utf-8"))
+                        + unlock_ubuntu_user_script
                         + init_script
                     )
 
                 else:
-                    init_script = self.create_add_keys_script(keys=additional_keys)
+                    init_script = (
+                        self.create_add_keys_script(keys=additional_keys)
+                        + encodeutils.safe_encode("\n".encode("utf-8"))
+                        + unlock_ubuntu_user_script
+                    )
 
             server = self.conn.create_server(
                 name=servername,

docker-compose.bibigrid.yml

@@ -17,7 +17,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.5
+    image: redis:7.0.6
     expose:
       - "6379"
     networks:
@@ -40,7 +40,7 @@ services:
 
   # filebeat
   filebeat:
-    image: docker.elastic.co/beats/filebeat:8.5.1
+    image: docker.elastic.co/beats/filebeat:8.5.3
     env_file:
       - .env
     volumes:

docker-compose.dev.bibigrid.yml

@@ -18,7 +18,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.5
+    image: redis:7.0.6
     expose:
       - "6379"
     networks:

docker-compose.dev.yml

@@ -18,7 +18,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.5
+    image: redis:7.0.6
     expose:
       - "6379"
     networks:

docker-compose.yml

@@ -17,7 +17,7 @@ services:
 
   client_redis:
     container_name: client_redis
-    image: redis:7.0.5
+    image: redis:7.0.6
     expose:
       - "6379"
     networks:
@@ -26,7 +26,7 @@ services:
   # filebeat
   filebeat:
     container_name: client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.5.1
+    image: docker.elastic.co/beats/filebeat:8.5.3
     env_file:
       - .env
     volumes:

requirements.txt

@@ -1,14 +1,14 @@
-setuptools==65.5.1
+setuptools==65.6.3
 thrift==0.16.0
 python-keystoneclient==5.0.1
-openstacksdk ==0.102.0
+openstacksdk ==0.103.0
 deprecated == 1.2.13
-ansible==6.6.0
+ansible==7.1.0
 Click==8.1.3
-flake8==5.0.4
+flake8==6.0.0
 paramiko==2.12.0
 ruamel.yaml==0.17.21
 pyvim==3.0.3
-redis==4.3.4
+redis==4.4.0
 requests==2.28.1
 pyyaml==6.0

requirements.yml

@@ -1,6 +1,6 @@
 roles:
   - name: oefenweb.rstudio_server
-    version: v2.7.1
+    version: v3.0.2
 
   - name: oefenweb.latest_r
     version: v3.1.1

thrift.dockerfile

@@ -0,0 +1,39 @@
+FROM ubuntu:20.04
+ENV DEBIAN_FRONTEND noninteractive
+RUN apt-get update && apt-get install -y \
+    wget \
+    build-essential \
+    automake \
+    libtool \
+    flex \
+    bison \
+    pkg-config \
+    libboost-all-dev \
+    libevent-dev \
+    libdouble-conversion-dev \
+    libgoogle-glog-dev \
+    libgflags-dev \
+    liblz4-dev \
+    liblzma-dev \
+    libsnappy-dev \
+    zlib1g-dev \
+    binutils-dev \
+    libjemalloc-dev \
+    libssl-dev
+
+RUN wget http://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz && \
+    tar xzf thrift-0.11.0.tar.gz && \
+    rm thrift-0.11.0.tar.gz && \
+    cd thrift-0.11.0 && \
+    ./configure --without-python && \
+    make && \
+    make install
+
+COPY . /app
+
+WORKDIR /app
+
+# Set the default target language to Python
+ENV TARGET_LANG python
+
+CMD thrift -r --gen $TARGET_LANG /app/$THRIFT_FILE