Skip to content

Infra File Cleanup #5596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rtibbles merged 11 commits into from
Dec 16, 2025
Merged

Infra File Cleanup #5596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0dc4909
First pass, based off of suggestions from AI.
DXCanas Dec 4, 2025
ff6209a
Removing vestigial git module definition
DXCanas Dec 4, 2025
c14ec2b
Removing symlink to prod dockerfile.
DXCanas Dec 4, 2025
840dcad
Clearing out prober code.
DXCanas Dec 4, 2025
aae5494
Moving nginx files out of `deploy` and housing them with other image-…
DXCanas Dec 4, 2025
200f537
WIP: Moving prod dockerfiles out of defunct k8s dir.
DXCanas Dec 5, 2025
1dbd0db
WIP: Flattening out new image structure, following current naming sta…
DXCanas Dec 5, 2025
c4155bf
Removing defunct cloudbuild-pr.yaml
DXCanas Dec 5, 2025
cb8cdfe
Flattening file structure further.
DXCanas Dec 5, 2025
0c39da8
Bringing in temporary symlinks for infra-side CD.
DXCanas Dec 5, 2025
1394aba
Cleaning up more prober code.
DXCanas Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/containerbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
with:
skip_after_successful_duplicate: false
github_token: ${{ github.token }}
paths: '["k8s/images/nginx/*", ".github/workflows/containerbuild.yml"]'
paths: '["docker/Dockerfile.nginx.prod", "nginx/*", ".github/workflows/containerbuild.yml"]'
Copy link
Member

@bjester bjester Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the second one "nginx/*" perhaps should have been "docker/nginx/*"?

Copy link
Member Author

@DXCanas DXCanas Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I… think maybe your right. Either that, or it was supposed to look at k8s/images/nginx/*, for the sake of the CD pipeline 🧐

The paths here were shuffled around multiple times and I think I got lost somewhere in that flurry 🙃

But this is the commit where it happened… so. idk. DXCanas@1dbd0db

Should I submit another PR to correct this? is it breaking build?

Copy link
Member

@bjester bjester Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rtibbles opened a followup yesterday! It's fixed


build_nginx:
name: nginx - test build of nginx Docker image
Expand All @@ -100,6 +100,6 @@ jobs:
uses: docker/build-push-action@v6
with:
context: ./
file: ./k8s/images/nginx/Dockerfile
file: ./docker/Dockerfile.nginx.prod
platforms: linux/amd64
push: false
6 changes: 0 additions & 6 deletions .gitmodules
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,7 @@ dcbuild:
$(DOCKER_COMPOSE) build

dcup: .docker/minio .docker/postgres
# run all services except for cloudprober
$(DOCKER_COMPOSE) up studio-app celery-worker

dcup-cloudprober: .docker/minio .docker/postgres
# run all services including cloudprober
# run all services
$(DOCKER_COMPOSE) up

dcdown:
Expand Down
102 changes: 0 additions & 102 deletions cloudbuild-pr.yaml
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions cloudbuild-production.yaml
View file
Open in desktop

This file was deleted.

Loading