ci : fixes in dokcercompose in volumes.

Author: Rahul Kumar Yadav

Access/background_task_manager.py

@@ -326,4 +326,3 @@ def revoke_request(user_access_mapping, revoker=None):
     if result:
         return True
     return False
-

Access/models.py

@@ -266,8 +266,8 @@ def update_revoker(self, revoker):
         self.save()
 
     def offboard(self, revoker):
-        self.state = "offboarding"
-        self.revoker = revoker
+        self.change_state("offboarding")
+        self.update_revoker(revoker)
         self.offbaord_date = datetime.datetime.now()
         self.user.is_active = False
         self.save()

Dockerfile

@@ -21,6 +21,8 @@ RUN mkdir -p logs
 RUN chown -R app /srv/code/dev
 USER app
 
+
+
 # Copy just requirements.txt
 COPY requirements.txt /tmp/requirements.txt
 COPY config.json.sample config.json
@@ -29,7 +31,6 @@ COPY config.json.sample config.json
 RUN pip install -r /tmp/requirements.txt --no-cache-dir --ignore-installed
 
 COPY --chown=app:root . .
-
 FROM base as test
 CMD ["python" "-m", "pytest", "-v", "--cov", "--disable-warnings" ]
 

docker-compose.yml

@@ -3,15 +3,13 @@ version: '3'
 services:
   web:
     container_name: dev
-    image: ${DOCKERIMAGE}
     build:
       context: .
       dockerfile: Dockerfile
       target: web
     env_file:
     - ./secrets/ops_app_dev.env
     volumes:
-    - .:/srv/code/dev
     - ./mounts/logs/:/ebs/logs/
     ports:
     - 8000:8000
@@ -42,9 +40,7 @@ services:
     image: redis:alpine
     command: --port 6379
     ports:
-      - "6379:6379"
-    expose:
-      - "6379"
+      - "6381:6379"
 
   celery:
     container_name: celery

scripts/clone_access_modules.py

@@ -27,9 +27,12 @@
                         and file != ".github"
                         and file != "secrets"
                     ) :
+                    try :
                         os.rename(
                             folder_path + "/" + file, "./Access/access_modules/" + file
                         )
+                    except:
+                         print("File is already present.")
 
                 if(file == "requirements.txt"):
                     current_requirements_file = folder_path + "/" + file
@@ -50,8 +53,8 @@
 
             print("Cloning successful!")
         except Exception as e:
-           print(e)
-        print("failed cloning " + folder_name + ".")
+           print("error-->",e)
+           print("failed cloning " + folder_name + ".")
 
         # remove the cloned repo folder entirely with all its contents which
         # includes folders and files using shutil.rmtree()