mirror of
https://github.com/open-cluster-management-io/ocm.git
synced 2026-02-14 18:09:57 +00:00
removing aws-cli image (#745)
Signed-off-by: suvaanshkumar <suvaanshkumar@gmail.com>
This commit is contained in:
Suvaansh
GitHub
11
.github/workflows/post.yml
vendored
11
.github/workflows/post.yml
vendored
@@ -71,7 +71,6 @@ jobs:
|
||||
docker push quay.io/open-cluster-management/work:latest-${{ matrix.arch }}
|
||||
docker push quay.io/open-cluster-management/placement:latest-${{ matrix.arch }}
|
||||
docker push quay.io/open-cluster-management/addon-manager:latest-${{ matrix.arch }}
|
||||
docker push quay.io/open-cluster-management/aws-cli:latest-${{ matrix.arch }}
|
||||
image-manifest:
|
||||
name: image manifest
|
||||
runs-on: ubuntu-latest
|
||||
@@ -102,10 +101,6 @@ jobs:
|
||||
docker manifest create quay.io/open-cluster-management/addon-manager:latest \
|
||||
quay.io/open-cluster-management/addon-manager:latest-amd64 \
|
||||
quay.io/open-cluster-management/addon-manager:latest-arm64
|
||||
# aws-cli
|
||||
docker manifest create quay.io/open-cluster-management/aws-cli:latest \
|
||||
quay.io/open-cluster-management/aws-cli:latest-amd64 \
|
||||
quay.io/open-cluster-management/aws-cli:latest-arm64
|
||||
- name: annotate
|
||||
run: |
|
||||
# registration-operator
|
||||
@@ -133,11 +128,6 @@ jobs:
|
||||
quay.io/open-cluster-management/addon-manager:latest-amd64 --arch amd64
|
||||
docker manifest annotate quay.io/open-cluster-management/addon-manager:latest \
|
||||
quay.io/open-cluster-management/addon-manager:latest-arm64 --arch arm64
|
||||
# aws-cli
|
||||
docker manifest annotate quay.io/open-cluster-management/aws-cli:latest \
|
||||
quay.io/open-cluster-management/aws-cli:latest-amd64 --arch amd64
|
||||
docker manifest annotate quay.io/open-cluster-management/aws-cli:latest \
|
||||
quay.io/open-cluster-management/aws-cli:latest-arm64 --arch arm64
|
||||
- name: push
|
||||
run: |
|
||||
docker manifest push quay.io/open-cluster-management/registration-operator:latest
|
||||
@@ -145,7 +135,6 @@ jobs:
|
||||
docker manifest push quay.io/open-cluster-management/work:latest
|
||||
docker manifest push quay.io/open-cluster-management/placement:latest
|
||||
docker manifest push quay.io/open-cluster-management/addon-manager:latest
|
||||
docker manifest push quay.io/open-cluster-management/aws-cli:latest
|
||||
trigger-clusteradm-e2e:
|
||||
needs: [ images, image-manifest ]
|
||||
name: trigger clusteradm e2e
|
||||
|
||||
11
.github/workflows/releaseimage.yml
vendored
11
.github/workflows/releaseimage.yml
vendored
@@ -72,7 +72,6 @@ jobs:
|
||||
docker push quay.io/open-cluster-management/placement:${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
|
||||
docker push quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
|
||||
docker push quay.io/open-cluster-management/addon-manager:${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
|
||||
docker push quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-${{ matrix.arch }}
|
||||
image-manifest:
|
||||
name: image manifest
|
||||
runs-on: ubuntu-latest
|
||||
@@ -106,10 +105,6 @@ jobs:
|
||||
docker manifest create quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }} \
|
||||
quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-amd64 \
|
||||
quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-arm64
|
||||
# aws-cli
|
||||
docker manifest create quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }} \
|
||||
quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-amd64 \
|
||||
quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-arm64
|
||||
- name: annotate
|
||||
run: |
|
||||
# registration
|
||||
@@ -137,11 +132,6 @@ jobs:
|
||||
quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-amd64 --arch amd64
|
||||
docker manifest annotate quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }} \
|
||||
quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}-arm64 --arch arm64
|
||||
# aws-cli
|
||||
docker manifest annotate quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }} \
|
||||
quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-amd64 --arch amd64
|
||||
docker manifest annotate quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }} \
|
||||
quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}-arm64 --arch arm64
|
||||
- name: push
|
||||
run: |
|
||||
docker manifest push quay.io/open-cluster-management/registration:${{ needs.env.outputs.RELEASE_VERSION }}
|
||||
@@ -149,4 +139,3 @@ jobs:
|
||||
docker manifest push quay.io/open-cluster-management/placement:${{ needs.env.outputs.RELEASE_VERSION }}
|
||||
docker manifest push quay.io/open-cluster-management/addon-manager:${{ needs.env.outputs.RELEASE_VERSION }}
|
||||
docker manifest push quay.io/open-cluster-management/registration-operator:${{ needs.env.outputs.RELEASE_VERSION }}
|
||||
docker manifest push quay.io/open-cluster-management/aws-cli:${{ needs.env.outputs.RELEASE_VERSION }}
|
||||
|
||||
3
Makefile
3
Makefile
@@ -62,15 +62,12 @@ REGISTRATION_IMAGE ?= $(IMAGE_REGISTRY)/registration:$(IMAGE_TAG)
|
||||
PLACEMENT_IMAGE ?= $(IMAGE_REGISTRY)/placement:$(IMAGE_TAG)
|
||||
# ADDON_MANAGER_IMAGE can be set in the env to override calculated value
|
||||
ADDON_MANAGER_IMAGE ?= $(IMAGE_REGISTRY)/addon-manager:$(IMAGE_TAG)
|
||||
# AWS_CLI_IMAGE can be set in the env to override calculated value
|
||||
AWS_CLI_IMAGE ?= $(IMAGE_REGISTRY)/aws-cli:$(IMAGE_TAG)
|
||||
|
||||
$(call build-image,registration,$(REGISTRATION_IMAGE),./build/Dockerfile.registration,.)
|
||||
$(call build-image,work,$(WORK_IMAGE),./build/Dockerfile.work,.)
|
||||
$(call build-image,placement,$(PLACEMENT_IMAGE),./build/Dockerfile.placement,.)
|
||||
$(call build-image,registration-operator,$(OPERATOR_IMAGE_NAME),./build/Dockerfile.registration-operator,.)
|
||||
$(call build-image,addon-manager,$(ADDON_MANAGER_IMAGE),./build/Dockerfile.addon,.)
|
||||
$(call build-image,aws-cli,$(AWS_CLI_IMAGE),./build/Dockerfile.aws-cli,.)
|
||||
|
||||
copy-crd:
|
||||
bash -x hack/copy-crds.sh $(YAML_PATCH)
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
FROM golang:1.22-bullseye AS builder
|
||||
ARG OS=linux
|
||||
ARG ARCH=amd64
|
||||
ARG VERSION=2.22.8
|
||||
|
||||
# Downloading aws-cli
|
||||
WORKDIR /tmp
|
||||
RUN apt-get update
|
||||
RUN apt-get install unzip
|
||||
RUN unzip -v
|
||||
RUN if [ "$ARCH" = "arm64" ]; then \
|
||||
curl "https://awscli.amazonaws.com/awscli-exe-${OS}-aarch64-${VERSION}.zip" -o "awscliv2.zip"; \
|
||||
else \
|
||||
curl "https://awscli.amazonaws.com/awscli-exe-${OS}-x86_64-${VERSION}.zip" -o "awscliv2.zip"; \
|
||||
fi && echo "The ARCH is $ARCH"
|
||||
RUN unzip awscliv2.zip
|
||||
|
||||
|
||||
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
|
||||
ENV USER_UID=10001
|
||||
|
||||
# Installing aws-cli
|
||||
RUN mkdir -p ./aws
|
||||
COPY --from=builder /tmp/aws ./aws
|
||||
RUN ./aws/install -i /usr/local/aws-cli -b /usr/local/bin
|
||||
RUN rm -rf ./aws/*
|
||||
RUN rmdir ./aws
|
||||
RUN aws --version
|
||||
|
||||
USER ${USER_UID}
|
||||
Reference in New Issue
Block a user