[PR #38] [MERGED] Unify prebuilt and src compose files #269

New issue

Closed

opened 2026-03-04 01:36:00 +03:00 by kerem · 0 comments

kerem commented

2026-03-04 01:36:00 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/spr-networks/super/pull/38
Author: @rgov
Created: 7/28/2022
Status: ✅ Merged
Merged: 8/5/2022
Merged by: @lts-rad

Base: dev ← Head: rzg/docker-improvements

📝 Commits (3)

4f43632 [build] Unify prebuilt and src compose files
0b05c38 [build] Label prebuilt images and delete when rebuilding
ed0f6b4 Merge branch 'dev' into rzg/docker-improvements

📊 Changes

9 files changed (+85 additions, -326 deletions)

View changed files

📝 .github/workflows/docker-image.yml (+2 -7)
📝 build_docker_compose.sh (+28 -2)
➖ docker-compose-src.yml (+0 -162)
📝 docker-compose-virt.yml (+22 -3)
➖ docker-compose-virtsrc.yml (+0 -133)
📝 docker-compose.yml (+30 -5)
📝 pull_containers.sh (+2 -8)
📝 run_docker_compose.sh (+1 -2)
➖ run_prebuilt.sh (+0 -4)

📄 Description

Fixes #36.

@lts-rad raised a concern about caching issues between prebuilt and built-from-source images, which led to the bifurcation. It would be great to have more technical details on those issues, but I attempted to work around them in the build_docker_compose.sh script: Images built in CI are labeled with org.supernetworks.ci = true, and the build script purges these first. There might be other solutions, like doing the build with --no-cache if any prebuilt images are detected.

The only part I wasn't really sure about was frontend, since there was some inconsistency between the use of /app/build/ vs /build/. @lts-rad suggested this may be a residual issue with the GitHub workflow that can be resolved?

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/spr-networks/super/pull/38 **Author:** [@rgov](https://github.com/rgov) **Created:** 7/28/2022 **Status:** ✅ Merged **Merged:** 8/5/2022 **Merged by:** [@lts-rad](https://github.com/lts-rad) **Base:** `dev` ← **Head:** `rzg/docker-improvements` --- ### 📝 Commits (3) - [`4f43632`](https://github.com/spr-networks/super/commit/4f436329b5b1a363dd15b1a7330d7f5cbe454f19) [build] Unify prebuilt and src compose files - [`0b05c38`](https://github.com/spr-networks/super/commit/0b05c3886b1e1b51ac5c9d1d6900d1baa18086ae) [build] Label prebuilt images and delete when rebuilding - [`ed0f6b4`](https://github.com/spr-networks/super/commit/ed0f6b46bb5f1aa0ff907dd3a12babfce71d8b43) Merge branch 'dev' into rzg/docker-improvements ### 📊 Changes **9 files changed** (+85 additions, -326 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/docker-image.yml` (+2 -7) 📝 `build_docker_compose.sh` (+28 -2) ➖ `docker-compose-src.yml` (+0 -162) 📝 `docker-compose-virt.yml` (+22 -3) ➖ `docker-compose-virtsrc.yml` (+0 -133) 📝 `docker-compose.yml` (+30 -5) 📝 `pull_containers.sh` (+2 -8) 📝 `run_docker_compose.sh` (+1 -2) ➖ `run_prebuilt.sh` (+0 -4) </details> ### 📄 Description Fixes #36. @lts-rad raised a concern about caching issues between prebuilt and built-from-source images, which led to the bifurcation. It would be great to have more technical details on those issues, but I attempted to work around them in the `build_docker_compose.sh` script: Images built in CI are labeled with `org.supernetworks.ci = true`, and the build script purges these first. There might be other solutions, like doing the build with `--no-cache` if any prebuilt images are detected. The only part I wasn't really sure about was `frontend`, since there was some inconsistency between the use of `/app/build/` vs `/build/`. @lts-rad suggested this may be a residual issue with the GitHub workflow that can be resolved? --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>