Skip to content

fix(aws static-site): aws-cli in runner image + honour baseDnsZone #281

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

Closed
smecsia wants to merge 2 commits into from
+16 −2
Closed

fix(aws static-site): aws-cli in runner image + honour baseDnsZone #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7599e4e
fix(github-actions-image): install aws-cli so static-site sync works
May 20, 2026
a62b1c4
fix(aws/static-site): implement DnsConfigAware so baseDnsZone is hono…
May 20, 2026
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
5 changes: 4 additions & 1 deletion github-actions-staging.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,10 @@ RUN rm -rf \
# ── runtime ─────────────────────────────────────────────────────────────────
FROM alpine:3.23@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a5019afde11

# aws-cli needed by Pulumi local.Command shell-outs (e.g. `aws s3 sync` in the
# static-website template at pkg/clouds/pulumi/aws/static_website.go).
RUN apk update && apk upgrade --no-cache \
&& apk add --no-cache ca-certificates git openssh-client curl jq bash python3 \
&& apk add --no-cache ca-certificates git openssh-client curl jq bash python3 aws-cli \
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*

COPY --from=builder /opt/pulumi /opt/pulumi
Expand All @@ -93,6 +95,7 @@ RUN chmod +x ./github-actions \
RUN pulumi version > /dev/null \
&& gcloud version > /dev/null \
&& gcloud components list --filter="name:gke-gcloud-auth-plugin" --format="value(name)" | grep -q gke-gcloud-auth-plugin \
&& aws --version > /dev/null \
&& test -L /usr/local/bin/sc && test -x /usr/local/bin/sc

LABEL org.opencontainers.image.source="https://github.com/simple-container-com/api" \
Expand Down
5 changes: 4 additions & 1 deletion github-actions.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,10 @@ RUN rm -rf \
FROM alpine:3.23@sha256:5b10f432ef3da1b8d4c7eb6c487f2f5a8f096bc91145e68878dd4a5019afde11

# python3 stays — gcloud invokes it. py3-pip / binutils / upx confined to builder.
# aws-cli needed by Pulumi local.Command shell-outs (e.g. `aws s3 sync` in the
# static-website template at pkg/clouds/pulumi/aws/static_website.go).
RUN apk update && apk upgrade --no-cache \
&& apk add --no-cache ca-certificates git openssh-client curl jq bash python3 \
&& apk add --no-cache ca-certificates git openssh-client curl jq bash python3 aws-cli \
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*

COPY --from=builder /opt/pulumi /opt/pulumi
Expand All @@ -107,6 +109,7 @@ RUN chmod +x ./github-actions \
RUN pulumi version > /dev/null \
&& gcloud version > /dev/null \
&& gcloud components list --filter="name:gke-gcloud-auth-plugin" --format="value(name)" | grep -q gke-gcloud-auth-plugin \
&& aws --version > /dev/null \
&& test -L /usr/local/bin/sc && test -x /usr/local/bin/sc

LABEL org.opencontainers.image.source="https://github.com/simple-container-com/api" \
Expand Down
8 changes: 8 additions & 0 deletions pkg/clouds/aws/static_website.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ type StaticSiteInput struct {
StackName string `json:"stackName" yaml:"stackName"`
}

// OverriddenBaseZone implements api.DnsConfigAware so the Cloudflare registrar
// uses the stack's baseDnsZone instead of the parent stack's default zone —
// otherwise records get created with the parent zone suffixed (e.g.
// simple-forge.com → simple-forge.com.simple-container.com).
func (i *StaticSiteInput) OverriddenBaseZone() string {
return i.Site.BaseDnsZone
}

func ToStaticSiteConfig(tpl any, stackDir, stackName string, stackCfg *api.StackConfigStatic) (any, error) {
templateCfg, ok := tpl.(*TemplateConfig)
if !ok {
Expand Down
Loading