diff --git a/services/gitea/.env b/services/gitea/.env index 7f8fc99..69a4404 100644 --- a/services/gitea/.env +++ b/services/gitea/.env @@ -1,2 +1,2 @@ -VM_USER=vm-user -STORAGE_PATH="/home/${VM_USER}/remote-apps" +CONFIG_PATH="/home/vm-user/remote-apps/gitea/config" +DATA_PATH="/home/vm-user/local-apps/gitea/data" diff --git a/services/gitea/docker-compose.yml b/services/gitea/docker-compose.yml index 2ff5031..5a9c085 100644 --- a/services/gitea/docker-compose.yml +++ b/services/gitea/docker-compose.yml @@ -1,18 +1,16 @@ version: "3" services: server: - image: docker.io/gitea/gitea:1.23.1 + image: docker.gitea.com/gitea:1.23.5 container_name: gitea environment: - - USER_UID=vm-user - - USER_GID=vm-user + - USER_UID=1001 + - USER_GID=1001 restart: always - networks: - - gitea volumes: - - ${STORAGE_PATH}:/data + - ${DATA_PATH}:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: - - "192.168.100.57:3000:3000" - - "192.168.100.57:22:22" \ No newline at end of file + - "3000:3000" + - "222:22" \ No newline at end of file diff --git a/services/gitea/init.sh b/services/gitea/init.sh deleted file mode 100755 index 1520a56..0000000 --- a/services/gitea/init.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /usr/bin/bash - -source ./.env -set -xe - -mkdir -p "${DOCKER_PARENT_PATH}" -mkdir -p "${SVC_PATH}" -mkdir -p "${SVC_PATH}/config" -mkdir -p "${SVC_PATH}/metadata" - diff --git a/services/services.yaml b/services/services.yaml index 5e8e1ed..60ce5e8 100644 --- a/services/services.yaml +++ b/services/services.yaml @@ -15,7 +15,12 @@ services: host: <<: *vm-media-100-55 <<: *defaultServiceValues - + + - name: "gitea" + host: + <<: *vm-tools-100-65 + <<: *defaultServiceValues + - name: "ippoolmanager-sql-server" host: <<: *vm-tools-100-65