Skip to content

[Fix] Fixes release workflow #197

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
kstribrnAmzn merged 3 commits into from
Dec 11, 2025
Merged

[Fix] Fixes release workflow #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41c275c
[Fix] Fixes release workflow
kstribrnAmzn Dec 10, 2025
ac6368d
Revert base image tag now that the new image is available
kstribrnAmzn Dec 11, 2025
60ad553
Add newline to bin image docker files
kstribrnAmzn Dec 11, 2025
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/docker-images/bin-images/amazonlinux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ RUN HOME_DIR=/root \
RUN yum check-update; yum upgrade -y && \
yum install -y libatomic libicu

ENTRYPOINT ["/root/bin/localproxy"]
ENTRYPOINT ["/root/bin/localproxy"]
2 changes: 1 addition & 1 deletion .github/docker-images/bin-images/debian-ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ RUN HOME_DIR=/root \
# OS-specific commands
RUN apt update && apt upgrade -y && apt install -y ca-certificates && update-ca-certificates

ENTRYPOINT ["/root/bin/localproxy"]
ENTRYPOINT ["/root/bin/localproxy"]
31 changes: 31 additions & 0 deletions .github/docker-images/bin-images/fedora/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
ARG BASE_IMAGE
FROM ${BASE_IMAGE} AS deploy

###############################################################################
# Copy and build local proxy
###############################################################################

COPY . /root/aws-iot-securetunneling-localproxy
RUN mkdir -p /root/aws-iot-securetunneling-localproxy/build \
&& cd /root/aws-iot-securetunneling-localproxy/build \
&& cmake .. \
&& make

FROM fedora:latest AS minimum_size

COPY --from=deploy /root/aws-iot-securetunneling-localproxy/build/bin/localproxy /root/bin/localproxy

COPY ./.github/docker-images/oss-compliance /root/oss-compliance
RUN HOME_DIR=/root \
&& cd ${HOME_DIR}/oss-compliance \
&& chmod +x ${HOME_DIR}/oss-compliance/generate-oss-compliance.sh \
&& chmod +x ${HOME_DIR}/oss-compliance/test/test-oss-compliance.sh \
&& bash ${HOME_DIR}/oss-compliance/generate-oss-compliance.sh ${HOME_DIR} \
&& rm -rf ${HOME_DIR}/oss-compliance*

# OS-specific commands
RUN dnf -y update; dnf -y install && \
libatomic libicu ca-certificates && \
update-ca-trust extract

ENTRYPOINT ["/root/bin/localproxy"]
2 changes: 1 addition & 1 deletion .github/docker-images/bin-images/ubi8/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ RUN yum check-update; yum upgrade -y && \
yum install -y libatomic libicu ca-certificates && \
update-ca-trust extract

ENTRYPOINT ["/root/bin/localproxy"]
ENTRYPOINT ["/root/bin/localproxy"]
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ jobs:
${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_DEBIAN }}:arm64-${{ github.sha }}
${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_DEBIAN }}:arm64-latest
platforms: linux/arm64
# Note: Since we only build a single image for fedora (amd64) we can tag with 'latest' in this step
build-docker-image-fedora-amd64:
runs-on: ubuntu-latest
permissions:
Expand Down Expand Up @@ -373,6 +374,7 @@ jobs:
tags: |
${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_FEDORA }}:amd64-${{ github.sha }}
${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_FEDORA }}:amd64-latest
${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_FEDORA }}:latest
platforms: linux/amd64
build-image-manifest-ubuntu:
runs-on: ubuntu-latest
Expand All @@ -397,7 +399,6 @@ jobs:
${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_UBUNTU }}:arm64-latest
${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_UBUNTU }}:armv7-latest
shell: bash

build-image-manifest-ubi8:
runs-on: ubuntu-latest
needs:
Expand All @@ -413,7 +414,7 @@ jobs:
- name: Login to ECR
run: aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin ${{ env.ECR_ACCOUNT_URL }}
- name: Create multi-image manifest
run: ddocker buildx imagetools create --tag ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_UBI8 }}:latest
run: docker buildx imagetools create --tag ${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_UBI8 }}:latest
${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_UBI8 }}:amd64-latest
${{ env.ECR_ACCOUNT_URL }}/${{ env.ECR_RELEASE_UBI8 }}:arm64-latest
build-image-manifest-amazonlinux:
Expand Down
Loading