remove uid and gid

subugoe · Oct 3, 2023 · a78a669 · a78a669
1 parent 9464ef7
commit a78a669
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/.env b/.env
@@ -17,5 +17,3 @@ OPERANDI_SERVER_DEFAULT_USERNAME=server_dev
 OPERANDI_SERVER_DEFAULT_PASSWORD=server_dev
 OPERANDI_SERVER_URL_LIVE=http://localhost:8000
 OPERANDI_SERVER_URL_LOCAL=http://0.0.0.0:8000
-GROUP_ID=0
-USER_ID=0
diff --git a/.github/workflows/tests/.env b/.github/workflows/tests/.env
@@ -0,0 +1,19 @@
+OPERANDI_DB_NAME=operandi_db_test
+OPERANDI_DB_ROOT_USER=admin_test
+OPERANDI_DB_ROOT_PASS=admin_test
+OPERANDI_DB_URL=mongodb://${OPERANDI_DB_ROOT_USER}:${OPERANDI_DB_ROOT_PASS}@localhost:27017
+OPERANDI_HARVESTER_DEFAULT_USERNAME=harvester_test
+OPERANDI_HARVESTER_DEFAULT_PASSWORD=harvester_test
+OPERANDI_HPC_USERNAME=mmustaf
+OPERANDI_HPC_SSH_KEYPATH=/home/runner/.ssh/key_hpc
+OPERANDI_HPC_PROJECT_NAME=operandi_test
+OPERANDI_LOGS_DIR=/tmp/operandi_logs_test
+OPERANDI_RABBITMQ_CONFIG_JSON=./src/rabbitmq_definitions.json
+OPERANDI_RABBITMQ_ROOT_USER=admin_test
+OPERANDI_RABBITMQ_ROOT_PASS=admin_test
+OPERANDI_RABBITMQ_URL=amqp://${OPERANDI_RABBITMQ_ROOT_USER}:${OPERANDI_RABBITMQ_ROOT_PASS}@localhost:5672/test
+OPERANDI_SERVER_BASE_DIR=/tmp/operandi_data_test
+OPERANDI_SERVER_DEFAULT_USERNAME=server_test
+OPERANDI_SERVER_DEFAULT_PASSWORD=server_test
+OPERANDI_SERVER_URL_LIVE=http://localhost:48000
+OPERANDI_SERVER_URL_LOCAL=http://0.0.0.0:48000
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -23,7 +23,6 @@ services:
       - type: bind
         source: ${OPERANDI_RABBITMQ_CONFIG_JSON}
         target: /rmq_definitions.json
-    user: ${USER_ID}:${GROUP_ID}
     environment:
       - RABBITMQ_SERVER_ERL_ARGS=-rabbitmq_management load_definitions "/rmq_definitions.json"
     networks:
@@ -42,7 +41,6 @@ services:
       - "27017:27017"
     volumes:
       - "/operandi-mongodb:/data/db"
-    user: ${USER_ID}:${GROUP_ID}
     environment:
       - MONGO_INITDB_ROOT_USERNAME=${OPERANDI_DB_ROOT_USER}
       - MONGO_INITDB_ROOT_PASSWORD=${OPERANDI_DB_ROOT_PASS}
@@ -80,7 +78,6 @@ services:
       - OPERANDI_SERVER_DEFAULT_PASSWORD=${OPERANDI_SERVER_DEFAULT_PASSWORD}
       - OPERANDI_SERVER_URL_LIVE=${OPERANDI_SERVER_URL_LIVE}
       - OPERANDI_SERVER_URL_LOCAL=${OPERANDI_SERVER_URL_LOCAL}
-    user: ${USER_ID}:${GROUP_ID}
     volumes:
       - "${OPERANDI_LOGS_DIR}:${OPERANDI_LOGS_DIR}"
       - "${OPERANDI_SERVER_BASE_DIR}:${OPERANDI_SERVER_BASE_DIR}"
@@ -108,7 +105,6 @@ services:
       - OPERANDI_HPC_SSH_KEYPATH=/home/root/.ssh/gwdg_hpc_key
       - OPERANDI_LOGS_DIR=${OPERANDI_LOGS_DIR}
       - OPERANDI_RABBITMQ_URL=${OPERANDI_RABBITMQ_URL}
-    user: ${USER_ID}:${GROUP_ID}
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "${OPERANDI_LOGS_DIR}:${OPERANDI_LOGS_DIR}"

diff --git a/docker-compose_image_based.yml b/docker-compose_image_based.yml
@@ -23,7 +23,6 @@ services:
       - type: bind
         source: ${OPERANDI_RABBITMQ_CONFIG_JSON}
         target: /rmq_definitions.json
-    user: ${USER_ID}:${GROUP_ID}
     environment:
       - RABBITMQ_SERVER_ERL_ARGS=-rabbitmq_management load_definitions "/rmq_definitions.json"
     networks:
@@ -42,7 +41,6 @@ services:
       - "27017:27017"
     volumes:
       - "/operandi-mongodb:/data/db"
-    user: ${USER_ID}:${GROUP_ID}
     environment:
       - MONGO_INITDB_ROOT_USERNAME=${OPERANDI_DB_ROOT_USER}
       - MONGO_INITDB_ROOT_PASSWORD=${OPERANDI_DB_ROOT_PASS}
@@ -77,7 +75,6 @@ services:
       - OPERANDI_SERVER_DEFAULT_PASSWORD=${OPERANDI_SERVER_DEFAULT_PASSWORD}
       - OPERANDI_SERVER_URL_LIVE=${OPERANDI_SERVER_URL_LIVE}
       - OPERANDI_SERVER_URL_LOCAL=${OPERANDI_SERVER_URL_LOCAL}
-    user: ${USER_ID}:${GROUP_ID}
     volumes:
       - "${OPERANDI_LOGS_DIR}:${OPERANDI_LOGS_DIR}"
       - "${OPERANDI_SERVER_BASE_DIR}:${OPERANDI_SERVER_BASE_DIR}"
@@ -102,7 +99,6 @@ services:
       - OPERANDI_HPC_SSH_KEYPATH=/home/root/.ssh/gwdg_hpc_key
       - OPERANDI_LOGS_DIR=${OPERANDI_LOGS_DIR}
       - OPERANDI_RABBITMQ_URL=${OPERANDI_RABBITMQ_URL}
-    user: ${USER_ID}:${GROUP_ID}
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "${OPERANDI_LOGS_DIR}:${OPERANDI_LOGS_DIR}"

diff --git a/docker.env b/docker.env
@@ -17,5 +17,3 @@ OPERANDI_SERVER_DEFAULT_USERNAME=server_dev
 OPERANDI_SERVER_DEFAULT_PASSWORD=server_dev
 OPERANDI_SERVER_URL_LIVE=http://localhost:8000
 OPERANDI_SERVER_URL_LOCAL=http://0.0.0.0:8000
-GROUP_ID=0
-USER_ID=0