Skip to content

Docker image naming cleanup #14

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
byo merged 1 commit into from
May 27, 2025
Merged

Docker image naming cleanup #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
app:
- name: tiles-updater
- name: maps-tile-uploader
env:
OUTPUTS_DIR: /tmp/outputs

Expand Down
8 changes: 4 additions & 4 deletions build/docker/Dockerfile.tiles-updater → build/docker/Dockerfile.maps-tile-uploader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} \
go build \
-v \
-ldflags="-w -s" \
-o "/home/go/tiles-updater" \
"./cmd/tiles-updater"
-o "/home/go/maps-tile-uploader" \
"./cmd/maps-tile-uploader"

# Force distroless base to use current platform (most likely linux/amd64)
# which is needed since distroless/static is not available for linux/arm/v6
FROM --platform=$BUILDPLATFORM gcr.io/distroless/static AS distroless

FROM scratch
COPY --from=distroless / /
COPY --from=build /home/go/tiles-updater /usr/sbin/tiles-updater
COPY --from=build /home/go/maps-tile-uploader /usr/sbin/maps-tile-uploader
USER nonroot:nonroot
EXPOSE 8080
ENTRYPOINT [ "/usr/sbin/tiles-updater" ]
ENTRYPOINT [ "/usr/sbin/maps-tile-uploader" ]
0 cmd/tiles-updater/defaultConfig.yaml → cmd/maps-tile-uploader/defaultConfig.yaml
View file
Open in desktop
File renamed without changes.
0 cmd/tiles-updater/main.go → cmd/maps-tile-uploader/main.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion helm/osm-machinery/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ cinodeUpload:

image:
registry: ghcr.io
repository: cinode/tiles-updater
repository: cinode/maps-tile-uploader
tag: "0.0.9"

securityContext:
Expand Down
9 changes: 6 additions & 3 deletions toolbox/release-chart-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,12 @@ else
sed -i "s/^version: .*/version: $new_version/" "$CHART_FILE"
fi

# Update tile-uploader image tag in values.yaml
# Match the tag line under cinodeUpload.image section
sed -i "/^[[:space:]]*repository\:[[:space:]]*cinode\/tiles-updater/{n;s/^\([[:space:]]*\)tag: .*/\1tag: \"$new_version\"/}" "$VALUES_FILE"
for image in \
maps-tile-uploader \
; do
# Update tile-uploader image tags in values.yaml
sed -i "/^[[:space:]]*repository\:[[:space:]]*cinode\/${image}/{n;s/^\([[:space:]]*\)tag: .*/\1tag: \"$new_version\"/}" "$VALUES_FILE"
done

# Commit the version bump with GPG signature (but don't push)
git add "$CHART_FILE" "$VALUES_FILE"
Expand Down
Loading