diff --git a/README.md b/README.md index 8c84c0a..3687d03 100755 --- a/README.md +++ b/README.md @@ -51,7 +51,6 @@ For most of the reference architectures, you'll need a Sonatype license. If you | `direct` | Yes | No | Yes - [here](http://repo.localhost:8081) | Yes - [here](http://iq.localhost:8070) | Both Nexus Repository Pro and Sonatype Lifecycle available directly via `localhost` addressed over HTTP. | | `repoOssDemo` | No | No | Yes - [here](http://repo.localhost:8081) | No | Nexus Repo OSS will be started. | | `cicd-jenkins` | Yes | Yes - [here](http://nexus-platform.localhost) | Yes [here](http://repo.localhost/) | Yes [here](http://iq.localhost/) | Includes a Jenkins [here](http://nexus-platform/jenkins) | -| `cicd-teamcity` | Yes | Yes - [here](http://nexus-platform.localhost) | Yes [here](http://repo.localhost/) | Yes [here](http://iq.localhost/) | Includes a TeamCity Server [here](http://nexus-platform/teamcity) | | `jenkins-direct` | No | No | No | No | Just Jenkins running [here](http://localhost:8888/jenkins) | ## Additional Sub Profiles diff --git a/config/nginx-cicd-teamcity.conf b/config/nginx-cicd-teamcity.conf deleted file mode 100644 index dc9df40..0000000 --- a/config/nginx-cicd-teamcity.conf +++ /dev/null @@ -1,84 +0,0 @@ -events { -} - -http { - proxy_send_timeout 120; - proxy_read_timeout 300; - proxy_buffering off; - keepalive_timeout 5 5; - tcp_nodelay on; - - client_max_body_size 1G; - - # See: https://confluence.jetbrains.com/pages/viewpage.action?pageId=74845225 - # ------------------------------------------------------ - # Required for Teamcity websocket agents - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } - - # Default Virtual Host for "Sonatype Platform" landing page - # ------------------------------------------------------ - server { - listen 80 default; - server_name nexus-platform.localhost; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - ignore_invalid_headers off; - - location /teamcity { - sendfile off; - proxy_pass http://teamcity-proxied:8111/teamcity; - proxy_redirect default; - proxy_http_version 1.1; - - # Required for Teamcity websocket agents - proxy_set_header Connection $connection_upgrade; - proxy_set_header Upgrade $http_upgrade; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - } - - # Virtual Host to proxy to Nexus Repository - # ------------------------------------------------------ - server { - listen 80; - server_name repo.localhost; - - location / { - proxy_pass http://nxrm3-proxied:8081/; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - proxy_set_header X-Forwarded-Proto $scheme; - } - } - - # Virtual Host to proxy to Sonatype Lifecycle - # ------------------------------------------------------ - server { - listen 80; - server_name iq.localhost; - - location / { - proxy_pass http://nxiq-proxied:8070/; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - proxy_set_header X-Forwarded-Proto $scheme; - } - } -} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0792f92..5ee8dfe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,7 +83,6 @@ services: profiles: - proxied - cicd-jenkins - - cicd-teamcity secrets: - admin_password volumes: @@ -155,7 +154,6 @@ services: profiles: - proxied - cicd-jenkins - - cicd-teamcity secrets: - admin_password volumes: @@ -268,38 +266,6 @@ services: - "./config/nginx-cicd.conf:/etc/nginx/nginx.conf:ro" - "./config/nginx-www:/usr/share/nginx/html:ro" - proxy-cicd-teamcity: - image: "nginx:${NGINX_VERSION:?err}" - depends_on: - - nxrm3-proxied - - nxiq-proxied - - teamcity-proxied - environment: - - NGINX_HOST=nexus-platform.localhost - - NGINX_PORT=80 - healthcheck: - test: - [ - "CMD", - "curl", - "--fail", - "--silent", - "http://localhost" - ] - interval: 15s - timeout: 2s - retries: 10 - start_period: 20s - networks: - - platform - ports: - - "80:80" - profiles: - - cicd-teamcity - volumes: - - "./config/nginx-cicd-teamcity.conf:/etc/nginx/nginx.conf:ro" - - "./config/nginx-www:/usr/share/nginx/html:ro" - # ------- Other non Sonatype Services -------- jenkins-direct: build: ./images/jenkins @@ -371,36 +337,6 @@ services: profiles: - swagger - # NOT ARM COMPATIBLE - teamcity-proxied: - build: ./images/teamcity-server - networks: - - platform - - teamcity - profiles: - - cicd-teamcity - volumes: - - '${DOCKER_ROOT_VOLUME_MOUNT_POINT:?err}/teamcity-server/data:/data/teamcity_server/datadir' - - '${DOCKER_ROOT_VOLUME_MOUNT_POINT:?err}/teamcity-server/logs:/opt/teamcity/logs' - - # NOT ARM COMPATIBLE - teamcity-agent-linux: - build: ./images/teamcity-agent - environment: - AGENT_NAME: 'Linux Agent' - SERVER_URL: 'http://teamcity-proxied:8111/teamcity' - networks: - - teamcity - profiles: - - cicd-teamcity - # teamcity-agent-windows: - # build: ./images/teamcity-agent-windows - # environment: - # AGENT_NAME: 'Windows Agent' - # SERVER_URL: 'http://teamcity-proxied:8111' - # networks: - # - teamcity - webhook-handler: image: sonatypecommunity/sonatype-webhook-handler:1.1.1 environment: @@ -417,7 +353,6 @@ services: networks: default: null platform: null - teamcity: null volumes: nxiq-data: diff --git a/images/teamcity-agent-windows/Dockerfile b/images/teamcity-agent-windows/Dockerfile deleted file mode 100644 index 3149e51..0000000 --- a/images/teamcity-agent-windows/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM jetbrains/teamcity-agent:2018.1-windowsservercore -# USER ContainerAdministrator -# RUN wget https://download.sonatype.com/clm/scanner/latest.jar -UseBasicParsing -OutFile "C:\Users\ContainerUser\nexus-cli.jar"; -# USER ConatainerUser \ No newline at end of file diff --git a/images/teamcity-agent/Dockerfile b/images/teamcity-agent/Dockerfile deleted file mode 100644 index 787de7e..0000000 --- a/images/teamcity-agent/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -ARG TEAMCITY_SERVER_VERSION=2021.1.2 -FROM jetbrains/teamcity-agent:${TEAMCITY_SERVER_VERSION} -USER buildagent -RUN curl -L -X GET -o /services/nexus-cli.jar https://download.sonatype.com/clm/scanner/latest.jar; \ No newline at end of file diff --git a/images/teamcity-server/Dockerfile b/images/teamcity-server/Dockerfile deleted file mode 100644 index 167cddc..0000000 --- a/images/teamcity-server/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -ARG TEAMCITY_SERVER_VERSION=2021.1.2 -FROM jetbrains/teamcity-server:${TEAMCITY_SERVER_VERSION} -USER tcuser - -# Move the installation so that we can access at /teamcity rather than just / -RUN mv /opt/teamcity/webapps/ROOT /opt/teamcity/webapps/teamcity; \ No newline at end of file