diff --git a/ansible/hosts.ini b/ansible/hosts.ini index 1ce9d33..9b387f3 100644 --- a/ansible/hosts.ini +++ b/ansible/hosts.ini @@ -1,2 +1,2 @@ [workers] -vm-gitea-100-11 ansible_host=192.168.100.11 ansible_user=tylen \ No newline at end of file +vm-jenkins-100-30 ansible_host=192.168.100.30 ansible_user=tylen \ No newline at end of file diff --git a/docker/vm-jenkins-100-30/jenkins/.env b/docker/vm-jenkins-100-30/jenkins/.env new file mode 100644 index 0000000..62d9e68 --- /dev/null +++ b/docker/vm-jenkins-100-30/jenkins/.env @@ -0,0 +1,2 @@ +APPS_JENKINS=/home/${USER}/remote-apps/jenkins +JENKINS_EXT_ADDRESS="192.168.100.30:4456" \ No newline at end of file diff --git a/jenkins/Dockerfile b/docker/vm-jenkins-100-30/jenkins/Dockerfile similarity index 100% rename from jenkins/Dockerfile rename to docker/vm-jenkins-100-30/jenkins/Dockerfile diff --git a/jenkins/docker-compose.yml b/docker/vm-jenkins-100-30/jenkins/docker-compose.yml similarity index 100% rename from jenkins/docker-compose.yml rename to docker/vm-jenkins-100-30/jenkins/docker-compose.yml diff --git a/docker/vm-jenkins-100-30/jenkins/init.sh b/docker/vm-jenkins-100-30/jenkins/init.sh new file mode 100755 index 0000000..0cf9494 --- /dev/null +++ b/docker/vm-jenkins-100-30/jenkins/init.sh @@ -0,0 +1,8 @@ +#! /usr/bin/bash + +source ./.env +set -xe + +mkdir -p "${APPS_JENKINS}" + + diff --git a/jenkins/plugins.txt b/docker/vm-jenkins-100-30/jenkins/plugins.txt similarity index 100% rename from jenkins/plugins.txt rename to docker/vm-jenkins-100-30/jenkins/plugins.txt diff --git a/docker/vm-tools-100-55/gitea/.env b/docker/vm-tools-100-55/gitea/.env index 2f001dc..2d1e0b7 100644 --- a/docker/vm-tools-100-55/gitea/.env +++ b/docker/vm-tools-100-55/gitea/.env @@ -1,3 +1 @@ -DOCKER_PARENT_PATH="/home/${USER}/docker" -SVC_PATH="${DOCKER_PARENT_PATH}/audiobookshelf" -MEDIA_PATH="/home/${USER}/Media" +STORAGE_PATH="/home/${USER}/remote-apps" diff --git a/docker/vm-tools-100-55/gitea/docker-compose.yml b/docker/vm-tools-100-55/gitea/docker-compose.yml index 6cada91..2ff5031 100644 --- a/docker/vm-tools-100-55/gitea/docker-compose.yml +++ b/docker/vm-tools-100-55/gitea/docker-compose.yml @@ -4,15 +4,15 @@ services: image: docker.io/gitea/gitea:1.23.1 container_name: gitea environment: - - USER_UID=1000 - - USER_GID=1000 + - USER_UID=vm-user + - USER_GID=vm-user restart: always networks: - gitea volumes: - - ./gitea:/data + - ${STORAGE_PATH}:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: - - "3000:3000" - - "22:22" \ No newline at end of file + - "192.168.100.57:3000:3000" + - "192.168.100.57:22:22" \ No newline at end of file diff --git a/docker/vm-tools-100-55/ippoolmanager-sql-server /.env b/docker/vm-tools-100-55/ippoolmanager-sql-server /.env index 0feac52..5d6ace1 100644 --- a/docker/vm-tools-100-55/ippoolmanager-sql-server /.env +++ b/docker/vm-tools-100-55/ippoolmanager-sql-server /.env @@ -1,2 +1,2 @@ -ROOT_PASSWORD="2F&B7yUoaE9F" -USER_PASSWORD="ippoolmanager" \ No newline at end of file +MYSQL_ROOT_PASSWORD="2F&B7yUoaE9F" +MYSQL_USER_PASSWORD="ippoolmanager" \ No newline at end of file diff --git a/jenkins/.env b/jenkins/.env deleted file mode 100644 index de8f3d3..0000000 --- a/jenkins/.env +++ /dev/null @@ -1,2 +0,0 @@ -APPS_JENKINS=/home/${USER}/apps/jenkins -JENKINS_EXT_ADDRESS="192.168.100.30:4456" \ No newline at end of file