Skip to content

Update ghcr.io/cybozu-go/website-operator#710

Open
012xx wants to merge 9 commits intomainfrom
transfer-cybozu-go
Open

Update ghcr.io/cybozu-go/website-operator#710
012xx wants to merge 9 commits intomainfrom
transfer-cybozu-go

Conversation

@012xx
Copy link
Copy Markdown
Contributor

@012xx 012xx commented Mar 27, 2026

Following the transfer of website-operator, the location for ghcr.io has changed to ghcr.io/cybozu-go/website-operator, so I have updated the references accordingly.
https://github.com/cybozu-go/website-operator/pkgs/container/website-operator

In addition, since there was an in-house container for ubuntu, I have updated that as well.

For this PR, I have only made the changes that can be easily addressed for now, and I plan to handle the API and CRD-related changes in a separate PR.

@012xx 012xx self-assigned this Mar 27, 2026
@012xx 012xx changed the title Transfer cybozu go Update ghcr.io/cybozu-go/website-operator Mar 27, 2026
@012xx 012xx force-pushed the transfer-cybozu-go branch from 54bfd0a to ce9146f Compare April 15, 2026 10:34
@012xx
Copy link
Copy Markdown
Contributor Author

012xx commented Apr 15, 2026

I am pushing commits for 00d64ae because the CI is failing for reasons like https://github.com/cybozu-go/website-operator/actions/runs/24449488424/job/71434444985?pr=711.

Copy link
Copy Markdown
Contributor Author

@012xx 012xx left a comment

Choose a reason for hiding this comment

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

ce9146f:
I feel like there might be a better way to write this, but I am making this change for now. Please leave a comment if there is a better way to rewrite the Dockerfile or a different approach altogether.

@012xx 012xx marked this pull request as ready for review April 15, 2026 10:50
@012xx 012xx requested a review from pddg April 15, 2026 10:50
@012xx 012xx mentioned this pull request Apr 15, 2026
Comment thread controllers/website_controller_test.go Outdated
Comment thread Dockerfile Outdated
Comment thread go.mod Outdated
@012xx 012xx force-pushed the transfer-cybozu-go branch from ce9146f to b30019c Compare April 16, 2026 05:24
@012xx 012xx force-pushed the transfer-cybozu-go branch 3 times, most recently from 5736876 to 16321f4 Compare April 16, 2026 05:51
@012xx 012xx requested a review from pddg April 16, 2026 06:01
Comment thread Dockerfile Outdated
Comment thread Dockerfile Outdated
@012xx 012xx force-pushed the transfer-cybozu-go branch 2 times, most recently from e24de5f to 4ca9a9b Compare April 17, 2026 01:58
@012xx 012xx requested a review from pddg April 17, 2026 02:35
Comment thread e2e/Makefile Outdated
load-images:
cd ../ && goreleaser release --clean --snapshot --skip=publish
cd ../ && cat .goreleaser.yml \
| PLATFORM="linux/$(shell uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/')" \
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
| PLATFORM="linux/$(shell uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/')" \
| PLATFORM="linux/$$(uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/')" \

Comment thread e2e/Makefile
Comment thread Dockerfile Outdated
Comment on lines +2 to +4
RUN groupmod -g 10000 ubuntu \
&& usermod -u 10000 -g 10000 ubuntu \
&& chown -R 10000:10000 /home/ubuntu
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

modifying current user's uid/gid may cause some problems.
Running as non-root user is important, not UID:GID=10000 is 10000.
Could we use the default ubuntu user (non-root) ?

@012xx 012xx force-pushed the transfer-cybozu-go branch from 4ca9a9b to c787f51 Compare April 17, 2026 06:19
012xx added 6 commits April 23, 2026 02:35
- Replace deprecated dockers/docker_manifests with unified dockers_v2
- Update Dockerfile for platform-aware binary copying with $TARGETPLATFORM
- Filter e2e build platforms to match host architecture
The previous image family included a uid/gid 10000 user, but the new base image does not.
To match the new image’s existing user, run repo-checker as uid/gid 1000 and use /home/ubuntu for HOME and deploy-key mount, fixing SSH host key/config issues.
Keep build/after-build workloads on uid/gid 10000 to remain compatible with zoetrope build images and avoid permission/no-user regressions.
@012xx 012xx force-pushed the transfer-cybozu-go branch from c787f51 to b29d57e Compare April 23, 2026 02:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants