diff --git a/environment/infra/docker-compose/docker-compose.yaml b/environment/infra/docker-compose/docker-compose.yaml deleted file mode 100644 index 0d0b078..0000000 --- a/environment/infra/docker-compose/docker-compose.yaml +++ /dev/null @@ -1,29 +0,0 @@ -services: - vaultwarden: - labels: - - traefik.http.routers.vaultwarden.rule=Host(`vaultwarden.rschneider.net`) - - traefik.http.routers.vaultwarden.tls=true - - traefik.http.routers.vaultwarden.service=vaultwarden - - traefik.http.services.vaultwarden.loadbalancer.server.port=80 - - traefik.http.routers.vaultwarden-public.rule=Host(`password.rschneider.hu`) - - traefik.http.routers.vaultwarden-public.tls=true - - traefik.http.routers.vaultwarden-public.service=vaultwarden-public - - traefik.http.services.vaultwarden-public.loadbalancer.server.port=80 -# - traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme=https -# - traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true - image: vaultwarden/server:latest - container_name: vaultwarden - restart: always - environment: - # DOMAIN: "https://vaultwarden.example.com" # required when using a reverse proxy; your domain; vaultwarden needs to know it's https to work properly with attachments - SIGNUPS_ALLOWED: "true" # Deactivate this with "false" after you have created your account so that no strangers can register - volumes: - - ./vw-data:/data # the path before the : can be changed - ports: - - 4111:80 # you can replace the 11001 with your preferred port - networks: - traefik_traefik: - -networks: - traefik_traefik: - external: true diff --git a/environment/infra/docker-compose/yogastic/docker-compose.yaml b/environment/infra/docker-compose/yogastic/docker-compose.yaml new file mode 100644 index 0000000..14f0bef --- /dev/null +++ b/environment/infra/docker-compose/yogastic/docker-compose.yaml @@ -0,0 +1,22 @@ +services: + vaultwarden: + labels: + - traefik.http.routers.yoga.rule=Host(`yoga.rschneider.net`) + - traefik.http.routers.yoga.tls=false + - traefik.http.routers.yoga.service=yoga + - traefik.http.services.yoga.loadbalancer.server.port=80 + - traefik.http.routers.yoga-public.rule=Host(`yoga.rschneider.hu`) + - traefik.http.routers.yoga-public.tls=false + - traefik.http.routers.yoga-public.service=yoga-public + - traefik.http.services.yoga-public.loadbalancer.server.port=80 +# - traefik.http.middlewares.test-redirectscheme.redirectscheme.scheme=https +# - traefik.http.middlewares.test-redirectscheme.redirectscheme.permanent=true + image: docker.rschneider.hu/infra/yogastic:202412282019.ae4bba3 + container_name: yogastic + restart: always + networks: + traefik_traefik: + +networks: + traefik_traefik: + external: true diff --git a/environment/infra/jenkins/Jenkinsfile b/environment/infra/jenkins/Jenkinsfile index 57c0847..9d451ca 100644 --- a/environment/infra/jenkins/Jenkinsfile +++ b/environment/infra/jenkins/Jenkinsfile @@ -4,9 +4,9 @@ pipeline { stages { stage('Git pull && docker compose restart') { steps { - sshPublisher(publishers: [sshPublisherDesc(configName: 'infra.1', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '''cd /home/rschneider/infra + sshPublisher(publishers: [sshPublisherDesc(configName: 'infra.1', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '''cd /home/rschneider/projects/yogastic git pull - cd /home/rschneider/infra/grafana/docker-compose/grafana + cd /home/rschneider/projects/yogastic/environment/infra/docker-compose/yogastic docker compose down docker compose up -d ''', execTimeout: 120000,