Skip to content
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.

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

fix: goproxy.cn 504 GATEWAY TIMEOUT on github CI #189

Merged
merged 4 commits into from
Apr 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/release-v1-main.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .github/workflows/release.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projenrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ project.release.addJobs({
{
name: 'Build lambda',
run: [
'docker build -t cdk-ecr-deployment-lambda lambda',
'docker build -t cdk-ecr-deployment-lambda --build-arg GOPROXY="https://goproxy.io|direct" lambda',
'docker run -v $PWD/lambda:/out cdk-ecr-deployment-lambda cp /asset/main /out',
'echo $(sha256sum lambda/main | awk \'{ print $1 }\') > lambda/main.sha256',
].join(' && '),
Expand Down
5 changes: 3 additions & 2 deletions lambda/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
ARG buildImage=public.ecr.aws/sam/build-go1.x:latest
ARG GOPROXY=https://goproxy.cn|https://goproxy.io|direct

FROM ${buildImage}

Expand All @@ -16,13 +17,13 @@ RUN yum -y install \
ENV GOOS=linux \
GOARCH=amd64 \
GO111MODULE=on \
GOPROXY=https://goproxy.cn|https://goproxy.io|direct
GOPROXY=${GOPROXY}

WORKDIR /ws

COPY go.mod go.sum ./

RUN go mod download -x
RUN go mod download

COPY . /ws

Expand Down
52 changes: 21 additions & 31 deletions lambda/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,29 @@ module cdk-ecr-deployment-handler
go 1.15

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/Microsoft/hcsshim v0.9.2 // indirect
github.com/aws/aws-lambda-go v1.23.0
github.com/aws/aws-sdk-go-v2 v1.14.0
github.com/aws/aws-sdk-go-v2/config v1.1.6
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.6 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.2.2
github.com/aws/aws-sdk-go-v2/service/s3 v1.5.0
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.14.0
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/containerd/cgroups v1.0.3 // indirect
github.com/containerd/containerd v1.5.10 // indirect
github.com/containers/image/v5 v5.17.0
github.com/docker/distribution v2.8.0+incompatible // indirect
github.com/docker/docker v20.10.12+incompatible // indirect
github.com/BurntSushi/toml v1.1.0 // indirect
github.com/aws/aws-lambda-go v1.29.0
github.com/aws/aws-sdk-go-v2 v1.16.2
github.com/aws/aws-sdk-go-v2/config v1.15.3
github.com/aws/aws-sdk-go-v2/service/ecr v1.17.3
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.4
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.15.4
github.com/containerd/containerd v1.6.2 // indirect
github.com/containers/image/v5 v5.21.0
github.com/containers/storage v1.39.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.3-0.20211202193544-a5463b7f9c84 // indirect
github.com/opencontainers/runc v1.1.0 // indirect
github.com/opencontainers/runc v1.1.1 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/common v0.30.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/common v0.33.0 // indirect
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.43.0 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
github.com/stretchr/testify v1.7.1
github.com/vbauerster/mpb/v7 v7.4.1 // indirect
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 // indirect
golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
)
Loading