Merge branch 'main' of ssh://gitlab.jafner.net:2229/Jafner/homelab

.gitlab-ci.yml

@@ -12,20 +12,12 @@ before_script:
   - mkdir -p ~/.ssh
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
 
-do-nothing:
+server-deploy:    
   stage: deploy
   when: always
+  rules:
+    - changes:
+        - server/
+      when: manual
   script:
-    - echo "Nothing'd successfully!"
+    - ssh joey@joey-server "cd /home/joey/homelab && git pull"
-
-#server-deploy:    
-#  stage: deploy
-#  when: always
-#  rules:
-#    - changes:
-#        - server/
-#      when: manual
-#  script:
-#    - ssh joey@joey-server "cd /home/joey && git archive --remote=ssh://git@gitlab.jafner.net:2229/Jafner/homelab.git main server/ | tar xvf -"
-#    - ssh joey@joey-server "cp -r server/config/* ./docker_config/"
-#    - ssh joey@joey-server "rm -rf server/"

server/config/gitlab/docker-compose.yml

@@ -19,7 +19,7 @@ services:
       #- '443:443'
       - '2229:22'
     volumes:
-      - '${DOCKER_CONFIG}/config:/etc/gitlab'
+      - '${DOCKER_DATA}/config:/etc/gitlab'
       - '${DOCKER_DATA}/logs:/var/log/gitlab'
       - '${DOCKER_DATA}/data:/var/opt/gitlab'
     shm_size: '256m'
@@ -31,4 +31,4 @@ services:
 
 networks:
   web:
-    external: true
+    external: true

server/config/homer/.env

@@ -1 +0,0 @@
-DOCKER_DATA=/home/joey/docker_config/homer/assets

server/config/homer/docker-compose.yml

@@ -8,7 +8,7 @@ services:
             - UID=1000
             - GID=1000
         volumes:
-            - ${DOCKER_DATA}:/www/assets
+            - ./assets:/www/assets
         networks:
             - web
         labels:

server/config/minecraft/.env

@@ -1,3 +1,3 @@
 DOCKER_DATA=/home/joey/data/minecraft
-DOCKER_CONFIG=/home/joey/docker_config/minecraft
+DOCKER_CONFIG=/home/joey/homelab/server/config/minecraft
 RCON_PASSWORD=eZJxnAxUa9qEacEZFKdU6cEL

server/config/traefik/.env

@@ -0,0 +1 @@
+DOCKER_DATA=/home/joey/data/traefik

server/config/traefik/docker-compose.yml

@@ -14,7 +14,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
       - ./traefik.toml:/traefik.toml
       - ./config:/config
-      - ./acme.json:/acme.json
+      - $DOCKER_DATA/acme.json:/acme.json
       - ./.htpasswd:/.htpasswd
 
 networks: