Dropped domain prefixes and unified container and network names

content/blog/03-gitea.md

@@ -37,7 +37,7 @@ mv * web
 Now create new `docker-compose.yml` file with following content:
 ```yaml
 networks:
-  jirkabuilds_proxy_network:
+  proxy_network:
 
 include:
   - web/docker-compose.yml
@@ -56,24 +56,24 @@ And you should be back online.
 Create new directory `gitea` for Gitea and it's data an into it create new `docker-compose.yml` file with following content:
 ```yaml
 networks:
-  gitea-internal:
-  jirkabuilds_proxy_network:
+  gitea_internal:
+  proxy_network:
 
 services:
-  jirkabuilds_gitea:
+  gitea:
     image: docker.gitea.com/gitea:latest
-    container_name: jirkabuilds_gitea
+    container_name: gitea
     environment:
       - USER_UID=${APP_UID}
       - USER_GID=${APP_GID}
       - GITEA__database__DB_TYPE=postgres
-      - GITEA__database__HOST=jirkabuilds_gitea_db:5432
+      - GITEA__database__HOST=gitea_db:5432
       - GITEA__database__NAME=${DB_NAME}
       - GITEA__database__USER=${DB_USER}
       - GITEA__database__PASSWD=${DB_PASSWORD}
     restart: always
     networks:
-      - gitea-internal
+      - gitea_internal
     volumes:
       - ./gitea:/data
       - /etc/timezone:/etc/timezone:ro
@@ -84,7 +84,7 @@ services:
     depends_on:
       - db
 
-  jirkabuilds_gitea_db:
+  gitea_db:
     image: docker.io/library/postgres:14
     restart: always
     environment:
@@ -92,7 +92,7 @@ services:
       - POSTGRES_PASSWORD=${DB_PASSWORD}
       - POSTGRES_DB=${DB_NAME}
     networks:
-      - gitea-internal
+      - gitea_internal
     volumes:
       - ./postgres:/var/lib/postgresql/data
 ```
@@ -122,33 +122,33 @@ When you finish initial setup, we can add Gitea to our stack. Start by editing G
 
 There you should remove line with ports and port definition under Gitea service and add proxy network under networks. Changed part of the file should look like this:
 ```yaml
-  jirkabuilds_gitea:
+  gitea:
     image: docker.gitea.com/gitea:latest
-    container_name: jirkabuilds_gitea
+    container_name: gitea
     environment:
       - USER_UID=${APP_UID}
       - USER_GID=${APP_GID}
       - GITEA__database__DB_TYPE=postgres
-      - GITEA__database__HOST=jirkabuilds_gitea_db:5432
+      - GITEA__database__HOST=gitea_db:5432
       - GITEA__database__NAME=${DB_NAME}
       - GITEA__database__USER=${DB_USER}
       - GITEA__database__PASSWD=${DB_PASSWORD}
     restart: always
     networks:
-      - gitea-internal
-      - jirkabuilds_proxy_network
+      - gitea_internal
+      - proxy_network
     volumes:
       - ./gitea:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     depends_on:
-      - jirkabuilds_gitea_db
+      - gitea_db
 ```
 
 Last step is to change `Caddyfile` in `web` folder. All you need to do is add following lines:
 ```
 git.jirkabuilds.dev {
-    reverse_proxy jirkabuilds_gitea:3000
+    reverse_proxy gitea:3000
 }
 ```
 If you have set up DNS correctly, after shutting the stack down and up the Gitea should be online.