From a1905b0e44738eba8d075bc1bcb14ec0d387635e Mon Sep 17 00:00:00 2001
From: Penelope Gwen <pogmommypenny@gmail.com>
Date: Wed, 17 Apr 2024 11:46:23 -0600
Subject: [PATCH] startall.sh now updates and prunes

---
 gitlab.yml  | 11 ++++++++++-
 startall.sh |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/gitlab.yml b/gitlab.yml
index d5c2a93..562f575 100644
--- a/gitlab.yml
+++ b/gitlab.yml
@@ -23,7 +23,7 @@ services:
     - DB_NAME=gitlabhq_production
     - DB_EXTENSION=pg_trgm,btree_gist
 
-  gitlab:
+  gitlab: # https://github.com/sameersbn/docker-gitlab
     restart: always
     image: sameersbn/gitlab:16.10.2
     container_name: gitlab
@@ -88,6 +88,15 @@ services:
       - SMTP_PASS=${SMTP_PASS}
       - SMTP_STARTTLS=true
 
+      - OAUTH_ENABLED=false
+      - OAUTH_EXTERNAL_PROVIDERS=github,gitlab
+
+      - OAUTH_GITHUB_API_KEY=${GL_GITHUB_API_KEY}
+      - OAUTH_GITHUB_APP_SECRET=${GL_GITHUB_API_SECRET}
+
+      - OAUTH_GITLAB_API_KEY=${GL_GITLAB_API_KEY}
+      - OAUTH_GITLAB_APP_SECRET=${GL_GITLAB_API_SECRET}
+
 #      - LDAP_ENABLED=true
 #      - LDAP_LABEL=LDAP
 #      - LDAP_HOST=${LDAP_SERVER}
diff --git a/startall.sh b/startall.sh
index 20f47c9..21c4b0c 100755
--- a/startall.sh
+++ b/startall.sh
@@ -4,5 +4,8 @@ script_root="$( dirname $0 )"
 
 for y in "${script_root}"/*.yml;do
   by="$(basename $y)"
+  sudo docker-compose -f "${y}" pull
   sudo docker-compose -f "${y}" -p "${by}" up -d
 done
+
+sudo docker image prune -f