update new settings for some apps

metavige · Mar 11, 2024 · b8cf3e2 · b8cf3e2
1 parent 5c9dbe9
commit b8cf3e2
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 28 deletions.
diff --git a/gitlab/config/gitlab.rb b/gitlab/config/gitlab.rb
@@ -0,0 +1,9 @@
+gitlab_rails['initial_root_password'] = '<my_strong_password>'
+
+external_url 'https://gitlab.gitlab.orb.local'
+gitlab_rails['gitlab_shell_ssh_port'] = 8822
+
+nginx['listen_port'] = 80
+nginx['listen_https'] = false
+nginx['redirect_http_to_https'] = true
+letsencrypt['enable'] = false
diff --git a/gitlab/docker-compose.yml b/gitlab/docker-compose.yml
@@ -1,17 +1,18 @@
-version: '3.7'
+version: '3.9'
 services:
   gitlab:
-    image: gitlab/gitlab-ce:14.1.2-ce.0
+    image: gitlab/gitlab-ce:16.5.4-ce.0
     hostname: gitlab.docker.internal
     ports:
       # - '80:80'
       # - '8443:443'
       - '8822:22'
     environment:
-      GITLAB_OMNIBUS_CONFIG: "from_file('/omnibus_config.rb')"
-    configs:
-      - source: gitlab
-        target: /omnibus_config.rb
+      GITLAB_OMNIBUS_CONFIG: |
+        from_file('/opt/omnibus_config/gitlab.rb')
+    # configs:
+    #   - source: gitlab
+    #     target: /omnibus_config.rb
     labels:
       - 'traefik.http.routers.gitlab.tls=true'
       - 'traefik.http.routers.gitlab.rule=Host(`gitlab.$MY_DOMAIN`)'
@@ -20,8 +21,9 @@ services:
     volumes:
       - gitlab-config:/etc/gitlab
       - gitlab-data:/var/opt/gitlab
+      - ./config:/opt/omnibus_config:ro
   runner:
-    image: gitlab/gitlab-runner:alpine-v14.1.0
+    image: gitlab/gitlab-runner:alpine-v16.5.0
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - gitlab-runner:/etc/gitlab-runner
@@ -31,6 +33,6 @@ volumes:
   gitlab-data: {}
   gitlab-runner: {}
 
-configs:
-  gitlab:
-    file: ./gitlab.rb
+# configs:
+#   gitlab:
+#     file: ./gitlab.rb
diff --git a/gitlab/gitlab.rb b/gitlab/gitlab.rb
diff --git a/keycloak/docker-compose.yml b/keycloak/docker-compose.yml
@@ -1,11 +1,15 @@
 version: '3'
 services:
   keycloak:
-    image: jboss/keycloak:14.0.0
+    image: quay.io/keycloak/keycloak:17.0.1
+    # platform: linux/amd64
     hostname: keycloak.docker.internal
+    command: start-dev
     environment:
-      - 'KEYCLOAK_USER=keycloak'
-      - 'KEYCLOAK_PASSWORD=keycloak'
+      - 'KEYCLOAK_admin=keycloak'
+      - 'KEYCLOAK_ADMIN_PASSWORD=keycloak'
+      # - 'KEYCLOAK_USER=keycloak'
+      # - 'KEYCLOAK_PASSWORD=keycloak'
       - 'PROXY_ADDRESS_FORWARDING=true'
       - 'DB_VENDOR=postgres'
       - 'DB_ADDR=postgres'
@@ -28,7 +32,7 @@ services:
     depends_on:
       - postgres
   postgres:
-    image: postgres:9.6
+    image: postgres:14
     volumes:
       - postgres_data:/var/lib/postgresql/data
     environment:

diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml
@@ -8,6 +8,7 @@ services:
     # ports:
     #   - 3306:3306
     labels:
-      - 'traefik.tcp.routers.sonarqube.rule=Host(`mysql.$MY_DOMAIN`)'
-      - 'traefik.tcp.routers.sonarqube.entrypoints.mysql.address=":3306"'
-      - 'traefik.tcp.services.sonarqube.loadBalancer.services.address=mysql:3306'
+      - 'traefik.tcp.routers.mysql.rule=Host(`mysql.$MY_DOMAIN`)'
+      - 'traefik.tcp.routers.mysql.entrypoints=mysql'
+      - 'traefik.tcp.routers.mysql.service=mysql'
+      - 'traefik.tcp.services.mysql.loadBalancer.server.port=3306'
diff --git a/n8n/docker-compose.yml b/n8n/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '3'
+services:
+  n8n:
+    image: n8nio/n8n
+    # ports:
+    #   - 5678:5678
+    labels:
+      - 'traefik.http.routers.n8n.tls=true'
+      - 'traefik.http.routers.n8n.rule=Host(`n8n.$MY_DOMAIN`)'
+      - 'traefik.http.routers.n8n.entrypoints=websecure'
+      - 'traefik.http.services.n8n.loadbalancer.server.port=5678'
+    volumes:
+      - ~/.n8n:/home/node/.n8n
diff --git a/postgres/docker-compose.yml b/postgres/docker-compose.yml
@@ -3,11 +3,16 @@ version: '3.1'
 services:
   db:
     image: postgres:13
-    ports:
-      - 5432:5432
+    # ports:
+    #   - 5432:5432
     environment:
       POSTGRES_USER: postgresl
       POSTGRES_PASSWORD: postgres
+    labels: 
+      - 'traefik.tcp.routers.postgres.rule=HostSNI(`postgres.$MY_DOMAIN`)'
+      - 'traefik.tcp.routers.postgres.entrypoints=postgres'
+      - 'traefik.tcp.routers.postgres.service=postgres'
+      - 'traefik.tcp.services.postgres.loadBalancer.server.port=5432' 
 
   # adminer:
   #   image: adminer

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
@@ -12,6 +12,8 @@ services:
       - '--providers.docker.exposedbydefault=true'
       - '--entrypoints.web.address=:80'
       - '--entrypoints.websecure.address=:443'
+      - '--entrypoints.mysql.address=:3306/tcp'
+      - '--entrypoints.postgres.address=:5432/tcp'
       - '--api.insecure=true'
       - '--api.dashboard=true'
       - '--providers.file.directory=/etc/traefik/dynamic_conf'
@@ -30,20 +32,20 @@ services:
     ports:
       - '80:80'
       - '443:443'
-      # - '8888:8080'
+      # - '5432:5432'
     volumes:
       # - '/etc/timezone:/etc/timezone:ro'
       - '/etc/localtime:/etc/localtime:ro'
       - '/var/run/docker.sock:/var/run/docker.sock:ro'
       - './certs:/certs'
       - './conf:/etc/traefik/dynamic_conf:ro'
       - './logs:/var/log/traefik'
-  whoami:
-    image: traefik/whoami
-    labels:
-      - 'traefik.http.routers.whoami.entrypoints=websecure'
-      - 'traefik.http.routers.whoami.tls=true'
-      - 'traefik.http.routers.whoami.rule=hostregexp(`whoami.$MY_DOMAIN`)'
+  # whoami:
+  #   image: traefik/whoami
+  #   labels:
+  #     - 'traefik.http.routers.whoami.entrypoints=websecure'
+  #     - 'traefik.http.routers.whoami.tls=true'
+  #     - 'traefik.http.routers.whoami.rule=hostregexp(`whoami.$MY_DOMAIN`)'
 # networks:
 #   default:
 #     external: true