[PR #907] [MERGED] ci: unify local and ci docker workflows #860

New issue

Closed

opened 2026-02-25 23:35:42 +03:00 by kerem · 0 comments

kerem commented

2026-02-25 23:35:42 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/go-shiori/shiori/pull/907
Author: @fmartingr
Created: 5/12/2024
Status: ✅ Merged
Merged: 5/14/2024
Merged by: @fmartingr

Base: master ← Head: issue-546

📝 Commits (10+)

eb05649 deps: go to 1.22.3
b330f6d removed ci dockerfile
7b44e27 add make buildx
adfdd8f updated dockerfile
c4491e8 ci uses make buildx command
696bbd4 commented upx for the future
3f1cb50 disable openbsd/arm tests
a47f191 wip
8f6fe06 put dist file in dist path
4286a11 Merge branch 'master' into issue-546

📊 Changes

12 files changed (+113 additions, -50 deletions)

View changed files

📝 .github/workflows/_buildx.yml (+2 -12)
📝 .github/workflows/_test.yml (+0 -3)
➖ .github/workflows/docker/Dockerfile.ci (+0 -11)
➖ .github/workflows/docker/etc/group (+0 -2)
➖ .github/workflows/docker/etc/passwd (+0 -2)
📝 .gitignore (+3 -0)
📝 .goreleaser.yaml (+9 -0)
📝 Dockerfile (+26 -15)
📝 Makefile (+40 -2)
📝 go.mod (+1 -1)
➕ scripts/buildx.sh (+30 -0)
📝 scripts/test.sh (+2 -2)

📄 Description

This pull request simplifies the CI and container files around to use the same logic locally and in the release process.

Removed all docker context from the CI, now using the main Dockerfile in the root of the repository
Refactored the dockerfile to streamline the build process: file is copied and some basics installed to a scratch image
Removed OpenBSD arm64 test step

Fixes #546
Closes #905

_{🔄 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/go-shiori/shiori/pull/907 **Author:** [@fmartingr](https://github.com/fmartingr) **Created:** 5/12/2024 **Status:** ✅ Merged **Merged:** 5/14/2024 **Merged by:** [@fmartingr](https://github.com/fmartingr) **Base:** `master` ← **Head:** `issue-546` --- ### 📝 Commits (10+) - [`eb05649`](https://github.com/go-shiori/shiori/commit/eb05649015b64c26974a955be302dbcb9cbcb298) deps: go to 1.22.3 - [`b330f6d`](https://github.com/go-shiori/shiori/commit/b330f6df7973734dc36e4aea70b1dbb93f657efc) removed ci dockerfile - [`7b44e27`](https://github.com/go-shiori/shiori/commit/7b44e277f740827455d1732535775b1afc80af2d) add make buildx - [`adfdd8f`](https://github.com/go-shiori/shiori/commit/adfdd8f93c7b0a69b2cacc805fcfa67fb1e3aa1c) updated dockerfile - [`c4491e8`](https://github.com/go-shiori/shiori/commit/c4491e8ca24e1b0e593a9ea6cd401d733dd70173) ci uses make buildx command - [`696bbd4`](https://github.com/go-shiori/shiori/commit/696bbd4c0dfe0ec48c55af25d6ee372b9fc1810c) commented upx for the future - [`3f1cb50`](https://github.com/go-shiori/shiori/commit/3f1cb5028d1ef668522f35cee551dc1e4403e163) disable openbsd/arm tests - [`a47f191`](https://github.com/go-shiori/shiori/commit/a47f19193e594116f4cfb393c3d4448e742cda6e) wip - [`8f6fe06`](https://github.com/go-shiori/shiori/commit/8f6fe061f0aed6394e1ef054de604f40fb501567) put dist file in dist path - [`4286a11`](https://github.com/go-shiori/shiori/commit/4286a1179a13b08bd57e76dd472f5999eef3e277) Merge branch 'master' into issue-546 ### 📊 Changes **12 files changed** (+113 additions, -50 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/_buildx.yml` (+2 -12) 📝 `.github/workflows/_test.yml` (+0 -3) ➖ `.github/workflows/docker/Dockerfile.ci` (+0 -11) ➖ `.github/workflows/docker/etc/group` (+0 -2) ➖ `.github/workflows/docker/etc/passwd` (+0 -2) 📝 `.gitignore` (+3 -0) 📝 `.goreleaser.yaml` (+9 -0) 📝 `Dockerfile` (+26 -15) 📝 `Makefile` (+40 -2) 📝 `go.mod` (+1 -1) ➕ `scripts/buildx.sh` (+30 -0) 📝 `scripts/test.sh` (+2 -2) </details> ### 📄 Description This pull request simplifies the CI and container files around to use the same logic locally and in the release process. - Removed all docker context from the CI, now using the main `Dockerfile` in the root of the repository - Refactored the dockerfile to streamline the build process: file is copied and some basics installed to a `scratch` image - Removed OpenBSD arm64 test step Fixes #546 Closes #905 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>