Merge pull request #1363 from MBARIMike/master

Remove 'oom_kill_disable: true' as it was added for MacOS Catalina problems, remove version - bump requests
MBARIMike · Nov 26, 2024 · a3919c6 · a3919c6
2 parents daf5810 + c399f3d
commit a3919c6
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 16 deletions.
diff --git a/docker/docker-compose-actions.yml b/docker/docker-compose-actions.yml
@@ -1,5 +1,3 @@
-version: '2.2'
-
 volumes:
   static-files:
   media-files:
@@ -28,7 +26,6 @@ services:
       - POSTGRES_PASSWORD=ci_password
       - DATABASE_URL=postgis://ci_user:ci_password@postgis:5432/default
     container_name: stoqs-postgis
-    oom_kill_disable: true
     restart: always
     shm_size: 1g
 

diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
@@ -1,5 +1,3 @@
-version: '2.2'
-
 volumes:
     static-files:
     media-files:
@@ -27,7 +25,6 @@ services:
       - PGDATA=/var/lib/postgresql/data/db_files
       - POSTGRES_INITDB_WALDIR=/var/lib/postgresql/waldir/wal_files
     container_name: stoqs-postgis
-    oom_kill_disable: true
     restart: always
     shm_size: 1g
     env_file:

diff --git a/docker/docker-compose.test.yml b/docker/docker-compose.test.yml
@@ -1,5 +1,3 @@
-version: '2.2'
-
 volumes:
     static-files:
     media-files:
@@ -26,7 +24,6 @@ services:
       - PGDATA=/var/lib/postgresql/data
       - POSTGRES_INITDB_WALDIR=/var/lib/postgresql/waldir
     container_name: stoqs-postgis
-    oom_kill_disable: true
     env_file:
       - ./.env
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.2'
-
 volumes:
     static-files:
     media-files:
@@ -27,7 +25,6 @@ services:
       - PGDATA=/var/lib/postgresql/data/db_files
       - POSTGRES_INITDB_WALDIR=/var/lib/postgresql/waldir/wal_files
     container_name: stoqs-postgis
-    oom_kill_disable: true
     restart: always
     shm_size: 1g
     env_file:

diff --git a/docker/requirements/base.txt b/docker/requirements/base.txt
@@ -1,4 +1,4 @@
-aiohttp==3.9.4
+aiohttp==3.11.7
 beautifulsoup4==4.12.3
 channels==4.1.0
 cmocean==4.0.3
@@ -7,7 +7,7 @@ coverage==7.4.4
 datadiff==2.2.0
 datashader==0.16.1
 dj-database-url==2.1.0
-Django==5.0.5
+Django==5.1.3
 django-cache-url==3.4.5
 django-configurations==2.5.1
 django-debug-toolbar==4.2.0

diff --git a/docker/requirements/development.txt b/docker/requirements/development.txt
@@ -14,7 +14,7 @@ ephem==4.1.5
 Genshi==0.7.7
 geopandas==0.14.4
 MarkupSafe==2.1.5
-requests==2.32.0
+requests==2.32.3
 requests-oauthlib==2.0.0
 Pygments==2.18.0
 pygraphviz==1.11

diff --git a/docker/requirements/production.txt b/docker/requirements/production.txt
@@ -3,6 +3,6 @@
 
 ephem==4.1.5
 geopandas==0.14.4
-requests==2.32.0
+requests==2.32.3
 requests-oauthlib==2.0.0
 uWSGI==2.0.25.1