[cpp-linbuild] 05/05: Embed config for local repo into the base Docker images

[John W. O'Brien]

This is an automated email from the git hooks/post-receive script.

obrienjw pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=65c47829d5540b523528d8f0cf40a50aa724ad8e

commit 65c47829d5540b523528d8f0cf40a50aa724ad8e
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Wed Apr 28 23:07:17 2021 +0000

    Embed config for local repo into the base Docker images
    
    N.b. that the repos initially hard code the path which should instead
    be set by the Makefile, and that they are disabled by default to
    avoid problems during initial image building.
---
 os/amazonlinux2/image/Dockerfile | 2 ++
 os/amazonlinux2/image/local.repo | 5 +++++
 os/centos6/image/local.repo      | 5 +++++
 os/centos7/image/Dockerfile      | 2 ++
 os/centos7/image/local.repo      | 5 +++++
 os/centos8/image/Dockerfile      | 2 ++
 os/centos8/image/local.repo      | 5 +++++
 7 files changed, 26 insertions(+)

diff --git a/os/amazonlinux2/image/Dockerfile b/os/amazonlinux2/image/Dockerfile
index 614eda4..d3ade80 100644
--- a/os/amazonlinux2/image/Dockerfile
+++ b/os/amazonlinux2/image/Dockerfile
@@ -1,5 +1,7 @@
 FROM amazonlinux:2.0.20210326.0
 
+COPY *.repo /etc/yum.repos.d/
+
 RUN yum -y update \
     && yum -y install \
         autoconf automake boost-devel chrpath curl-devel doxygen \
diff --git a/os/amazonlinux2/image/local.repo b/os/amazonlinux2/image/local.repo
new file mode 100644
index 0000000..abe1732
--- /dev/null
+++ b/os/amazonlinux2/image/local.repo
@@ -0,0 +1,5 @@
+[local]
+name=Local Shibboleth-SP Build Repo
+baseurl=file:///opt/build/external/out/RPMS/$basearch/
+gpgcheck=0
+enabled=0
diff --git a/os/centos6/image/local.repo b/os/centos6/image/local.repo
new file mode 100644
index 0000000..abe1732
--- /dev/null
+++ b/os/centos6/image/local.repo
@@ -0,0 +1,5 @@
+[local]
+name=Local Shibboleth-SP Build Repo
+baseurl=file:///opt/build/external/out/RPMS/$basearch/
+gpgcheck=0
+enabled=0
diff --git a/os/centos7/image/Dockerfile b/os/centos7/image/Dockerfile
index ec1e7bf..2d6a73c 100644
--- a/os/centos7/image/Dockerfile
+++ b/os/centos7/image/Dockerfile
@@ -1,5 +1,7 @@
 FROM centos:7.9.2009
 
+COPY *.repo /etc/yum.repos.d/
+
 RUN yum -y update \
     && yum -y install \
         autoconf automake boost-devel chrpath doxygen gcc-c++ git groff \
diff --git a/os/centos7/image/local.repo b/os/centos7/image/local.repo
new file mode 100644
index 0000000..abe1732
--- /dev/null
+++ b/os/centos7/image/local.repo
@@ -0,0 +1,5 @@
+[local]
+name=Local Shibboleth-SP Build Repo
+baseurl=file:///opt/build/external/out/RPMS/$basearch/
+gpgcheck=0
+enabled=0
diff --git a/os/centos8/image/Dockerfile b/os/centos8/image/Dockerfile
index 2f431ab..31ecf6c 100644
--- a/os/centos8/image/Dockerfile
+++ b/os/centos8/image/Dockerfile
@@ -1,5 +1,7 @@
 FROM centos:8.3.2011
 
+COPY *.repo /etc/yum.repos.d/
+
 RUN sed -i "s/enabled=0/enabled=1/" /etc/yum.repos.d/CentOS-Linux-PowerTools.repo \
     && yum -y update \
     && yum -y install \
diff --git a/os/centos8/image/local.repo b/os/centos8/image/local.repo
new file mode 100644
index 0000000..abe1732
--- /dev/null
+++ b/os/centos8/image/local.repo
@@ -0,0 +1,5 @@
+[local]
+name=Local Shibboleth-SP Build Repo
+baseurl=file:///opt/build/external/out/RPMS/$basearch/
+gpgcheck=0
+enabled=0

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.