Skip to content

Commit c0b6ae6

Browse files
committed
Docker image naming cleanup
1 parent 68c92e8 commit c0b6ae6

6 files changed

Lines changed: 12 additions & 9 deletions

File tree

.github/workflows/images.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
app:
29-
- name: tiles-updater
29+
- name: maps-tile-uploader
3030
env:
3131
OUTPUTS_DIR: /tmp/outputs
3232

build/docker/Dockerfile.tiles-updater renamed to build/docker/Dockerfile.maps-tile-uploader

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT#v} \
2727
go build \
2828
-v \
2929
-ldflags="-w -s" \
30-
-o "/home/go/tiles-updater" \
31-
"./cmd/tiles-updater"
30+
-o "/home/go/maps-tile-uploader" \
31+
"./cmd/maps-tile-uploader"
3232

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

3737
FROM scratch
3838
COPY --from=distroless / /
39-
COPY --from=build /home/go/tiles-updater /usr/sbin/tiles-updater
39+
COPY --from=build /home/go/maps-tile-uploader /usr/sbin/maps-tile-uploader
4040
USER nonroot:nonroot
4141
EXPOSE 8080
42-
ENTRYPOINT [ "/usr/sbin/tiles-updater" ]
42+
ENTRYPOINT [ "/usr/sbin/maps-tile-uploader" ]

helm/osm-machinery/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ cinodeUpload:
106106

107107
image:
108108
registry: ghcr.io
109-
repository: cinode/tiles-updater
109+
repository: cinode/maps-tile-uploader
110110
tag: "0.0.9"
111111

112112
securityContext:

toolbox/release-chart-version.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,12 @@ else
4040
sed -i "s/^version: .*/version: $new_version/" "$CHART_FILE"
4141
fi
4242

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

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

0 commit comments

Comments
 (0)