Skip to content

Commit

Permalink
Merge pull request #40 from sonatype-nexus-community/cleanup/remove-t…
Browse files Browse the repository at this point in the history
…eamcity

feat: remove Team City related configuration and profile
  • Loading branch information
madpah authored Oct 17, 2024
2 parents 0ff3244 + 2d7ff49 commit 5b9482d
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 164 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
84 changes: 0 additions & 84 deletions config/nginx-cicd-teamcity.conf

This file was deleted.

65 changes: 0 additions & 65 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ services:
profiles:
- proxied
- cicd-jenkins
- cicd-teamcity
secrets:
- admin_password
volumes:
Expand Down Expand Up @@ -155,7 +154,6 @@ services:
profiles:
- proxied
- cicd-jenkins
- cicd-teamcity
secrets:
- admin_password
volumes:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -417,7 +353,6 @@ services:
networks:
default: null
platform: null
teamcity: null

volumes:
nxiq-data:
Expand Down
4 changes: 0 additions & 4 deletions images/teamcity-agent-windows/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions images/teamcity-agent/Dockerfile

This file was deleted.

6 changes: 0 additions & 6 deletions images/teamcity-server/Dockerfile

This file was deleted.

0 comments on commit 5b9482d

Please sign in to comment.