diff --git a/deploy-this/create-common-volume.jenkinsfile b/deploy-this/create-common-volume.jenkinsfile deleted file mode 100755 index c8bb226..0000000 --- a/deploy-this/create-common-volume.jenkinsfile +++ /dev/null @@ -1,25 +0,0 @@ -pipeline { - agent any - - environment { - VOLUME_NAME = 'apps-data' // Nazwa woluminu Dockera - } - - stages { - stage('Create Docker Volume') { - steps { - script { - // Sprawdzenie i tworzenie woluminu w jednym kroku - sh """ - if ! docker volume ls --filter name=${VOLUME_NAME} --format '{{.Name}}' | grep -qw ${VOLUME_NAME}; then - docker volume create ${VOLUME_NAME} - echo "Volume '${VOLUME_NAME}' created successfully." - else - echo "Volume '${VOLUME_NAME}' already exists." - fi - """ - } - } - } - } -} diff --git a/deploy-this/deploy-dc.yml b/deploy-this/deploy-dc.yml index 85a57eb..8dd9ae3 100755 --- a/deploy-this/deploy-dc.yml +++ b/deploy-this/deploy-dc.yml @@ -18,7 +18,7 @@ services: volumes: # Konfiguracja Nginx - - apps-data:/etc/nginx/conf.d:ro + - /_sd_/nginx:/etc/nginx/conf.d:ro - nginx_cache:/var/cache/nginx @@ -35,11 +35,9 @@ volumes: type: tmpfs device: tmpfs o: size=3G - - apps-data: - external: true networks: proxy-net: name: proxy-net - driver: bridge \ No newline at end of file + driver: bridge + \ No newline at end of file diff --git a/deploy-this/start-proxy.jenkinsfile b/deploy-this/start-proxy.jenkinsfile index 521aa6d..2104c17 100755 --- a/deploy-this/start-proxy.jenkinsfile +++ b/deploy-this/start-proxy.jenkinsfile @@ -7,8 +7,8 @@ pipeline { script{ def nxinx_build ="docker compose --file deploy-this/deploy-dc.yml up --detach " sh(nxinx_build); - sh "rm -f /apps-data/*.conf" - sh "cp nginx-config/${PROTOCOL}/*.conf /apps-data" + sh "rm -f /_sd/nginx/*.conf" + sh "cp nginx-config/${PROTOCOL}/*.conf /_sd/nginx" } } } diff --git a/jenkins/docker-compose.yml b/jenkins/docker-compose.yml index 4c5f4c8..471b3f4 100755 --- a/jenkins/docker-compose.yml +++ b/jenkins/docker-compose.yml @@ -24,8 +24,5 @@ services: - ${DOCKER_DATA}:/_docker_data_:rw - /usr/lib/jvm/java-17-openjdk-amd64:/java-17 - ${DOCKER_DATA}/jenkins_home:/var/jenkins_home - - apps-data:/apps-data - /_sd_:/_sd_ -volumes: - apps-data: - external: true +