From e16b4653c3a7c1a6ba77713d63d41395d77665c7 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Sat, 6 Mar 2021 00:36:19 +0100
Subject: [PATCH 1/2] Adopt bundle to Gemfile changes

---
 Gemfile.lock | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2e02a659..ee745108 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -237,8 +237,6 @@ GEM
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
-    inversion (1.1.1)
-      loggability (~> 0.12)
     io-like (0.3.0)
     iso-639 (0.2.8)
     jaro_winkler (1.5.3)
@@ -268,7 +266,6 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loggability (0.14.0)
     loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -443,12 +440,6 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rbtree3 (0.5.0)
-    rdoc (6.0.4)
-    rdoc-generator-fivefish (0.4.0)
-      inversion (~> 1.1)
-      loggability (~> 0.12)
-      rdoc (~> 6.0)
-      yajl-ruby (~> 1.3)
     recaptcha (4.14.0)
       json
     redcarpet (3.5.0)
@@ -606,7 +597,6 @@ GEM
       chronic (>= 0.6.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yajl-ruby (1.4.1)
 
 PLATFORMS
   ruby
@@ -693,7 +683,6 @@ DEPENDENCIES
   rails-assets-waypoints!
   rails-controller-testing
   rails-i18n
-  rdoc-generator-fivefish
   recaptcha
   redcarpet
   responders (~> 2.0)
@@ -725,7 +714,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 2.5.0p0
+   ruby 2.5.8p224
 
 BUNDLED WITH
    1.17.3

From 2e706347a79c7f8bd9fae796b56225924bad87c7 Mon Sep 17 00:00:00 2001
From: Henne Vogelsang <hvogel@opensuse.org>
Date: Sat, 6 Mar 2021 01:29:42 +0100
Subject: [PATCH 2/2] Pin the postgres container version

---
 docker-compose.yml                    | 3 ++-
 docker-compose.yml.production-example | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8f31749c..0df48db2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,9 +2,10 @@ version: "2"
 
 services:
   database:
-    image: postgres
+    image: postgres:12-alpine
     environment:
       PGDATA: /var/lib/postgresql/data/pgdata
+      POSTGRES_PASSWORD: mysecretpassword
   osem:
     build:
       context: .
diff --git a/docker-compose.yml.production-example b/docker-compose.yml.production-example
index f4f0c173..d58535d2 100644
--- a/docker-compose.yml.production-example
+++ b/docker-compose.yml.production-example
@@ -2,9 +2,10 @@ version: "2"
 
 services:
   production_database:
-    image: postgres
+    image: postgres:12-alpine
     environment:
       PGDATA: /var/lib/postgresql/data/pgdata
+      POSTGRES_PASSWORD: mysecretpassword
     volumes:
       - osem_production_database:/var/lib/postgresql/data/pgdata
   production_web: