Skip to content

Commit a1eb6a5

Browse files
authored
Merge pull request #243 from awszhen/codebuild
Update mono install commands and remove dirmngr for AmazonLinux2 stan…
2 parents e2fae05 + a6bc1eb commit a1eb6a5

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

al2/x86_64/standard/1.0/Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ ENV DOCKER_BUCKET="download.docker.com" \
3232
GITVERSION_VERSION="4.0.0" \
3333
DEBIAN_FRONTEND="noninteractive" \
3434
SRC_DIR="/usr/src" \
35-
EPEL_REPO="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" \
36-
TRINITY_REPO="https://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el7/trinity-r14/RPMS/noarch/trinity-repo-14.0.5-1.el7.noarch.rpm"
35+
EPEL_REPO="https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
3736

3837
# Install git, SSH, and other utilities
3938
RUN set -ex \
@@ -43,13 +42,13 @@ RUN set -ex \
4342
&& ssh-keyscan -t rsa,dsa -H github.com >> ~/.ssh/known_hosts \
4443
&& ssh-keyscan -t rsa,dsa -H bitbucket.org >> ~/.ssh/known_hosts \
4544
&& chmod 600 ~/.ssh/known_hosts \
46-
&& yum install -y $EPEL_REPO $TRINITY_REPO \
47-
&& rpm --import "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" \
45+
&& yum install -y $EPEL_REPO \
46+
&& rpm --import https://download.mono-project.com/repo/xamarin.gpg \
4847
&& curl https://download.mono-project.com/repo/centos7-stable.repo | tee /etc/yum.repos.d/mono-centos7-stable.repo \
4948
&& amazon-linux-extras enable corretto8 \
5049
&& yum groupinstall -y "Development tools" \
5150
&& yum install -y wget fakeroot jq \
52-
dirmngr bzr mercurial procps-ng \
51+
bzr mercurial procps-ng \
5352
ImageMagick \
5453
openssl-devel libdb-devel \
5554
libevent-devel libffi-devel GeoIP-devel glib2-devel \

0 commit comments

Comments
 (0)