From cf41bcc7cab9c5f78e3d3b01b032c008e9861f7a Mon Sep 17 00:00:00 2001 From: Caesonia Date: Wed, 31 Jan 2024 17:01:00 -0500 Subject: [PATCH] Fixing apk install failure. --- Dockerfile.multi | 5 +++-- cfn/cfn-registry-cluster.yml | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile.multi b/Dockerfile.multi index 6fed0ed..0aa643e 100644 --- a/Dockerfile.multi +++ b/Dockerfile.multi @@ -2,8 +2,7 @@ FROM golang:alpine3.19 AS builder -RUN apk update && \ - apk add --no-cache upx make build-base bash git openssl +#RUN apk update && apk add --no-cache upx make build-base bash git openssl ENV CGO_ENABLED=0 \ GOOS=linux \ @@ -21,6 +20,8 @@ RUN go build -o ./main FROM golang:alpine3.19 +RUN apk update && apk add --no-cache upx make build-base bash git openssl + WORKDIR /app COPY --from=builder /app/main /app/main diff --git a/cfn/cfn-registry-cluster.yml b/cfn/cfn-registry-cluster.yml index 27da06f..517a956 100644 --- a/cfn/cfn-registry-cluster.yml +++ b/cfn/cfn-registry-cluster.yml @@ -187,7 +187,7 @@ Resources: - Condition: SUCCESS ContainerName: Nsqadmin_ResolvConf_InitContainer Essential: true - Image: 997427182289.dkr.ecr.us-east-1.amazonaws.com/docker-hub/aptrust/registry:7c2bb05-nat-removal + Image: 997427182289.dkr.ecr.us-east-1.amazonaws.com/docker-hub/aptrust/registry:0e39ecd-nat-removal Secrets: - Name: APT_ENV ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/APT_ENV' @@ -265,8 +265,6 @@ Resources: ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/AWS_SES_PWD' - Name: AWS_SES_USER ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/AWS_SES_USER' - - Name: BATCH_DELETION_KEY - ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/BATCH_DELETION_KEY' LinuxParameters: {} LogConfiguration: LogDriver: awslogs