Skip to content

Commit ecdf14c

Browse files
committed
centos7: update Dockerfile
Signed-off-by: Shizuo Fujita <[email protected]>
1 parent 8049a71 commit ecdf14c

File tree

1 file changed

+58
-53
lines changed

1 file changed

+58
-53
lines changed

fluent-package/yum/centos-7/Dockerfile

Lines changed: 58 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,59 +15,64 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
ARG FROM=centos:7
18+
ARG FROM=ghcr.io/fluent/fluent-package-centos-7
1919
FROM ${FROM}
2020

21-
COPY qemu-* /usr/bin/
21+
## The following setting had used for initial building ghcr.io/fluent/fluent-package-centos-7.
2222

23-
ARG DEBUG
24-
25-
RUN sed -i'' -e 's/^mirrorlist/#mirrorlist/g' \
26-
-e 's/^#baseurl/baseurl/g' \
27-
-e 's,mirror.centos.org/centos/$releasever,vault.centos.org/7.9.2009,g' \
28-
/etc/yum.repos.d/CentOS-Base.repo
29-
30-
RUN \
31-
quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
32-
yum update -y ${quiet} && \
33-
yum install -y ${quiet} centos-release-scl && \
34-
sed -i'' -e 's/^mirrorlist/#mirrorlist/g' \
35-
-e 's/^# baseurl/baseurl/g' \
36-
-e 's,mirror.centos.org/centos/7,vault.centos.org/7.9.2009,g' \
37-
/etc/yum.repos.d/CentOS-SCLo-scl.repo && \
38-
sed -i'' -e 's/^mirrorlist/#mirrorlist/g' \
39-
-e 's/^#baseurl/baseurl/g' \
40-
-e 's,mirror.centos.org/centos/7,vault.centos.org/7.9.2009,g' \
41-
/etc/yum.repos.d/CentOS-SCLo-scl-rh.repo && \
42-
yum install -y ${quiet} epel-release && \
43-
yum groupinstall -y ${quiet} "Development Tools" && \
44-
yum install -y ${quiet} \
45-
devtoolset-11 \
46-
rh-ruby26-ruby-devel \
47-
rh-ruby26-rubygems \
48-
rh-ruby26-rubygem-rake \
49-
rh-ruby26-rubygem-bundler \
50-
libcap-ng-devel \
51-
libedit-devel \
52-
ncurses-devel \
53-
libyaml-devel \
54-
libffi-devel \
55-
git \
56-
cyrus-sasl-devel \
57-
nss-softokn-freebl-devel \
58-
pkg-config \
59-
rpm-build \
60-
rpmdevtools \
61-
redhat-rpm-config \
62-
openssl-devel \
63-
tar \
64-
zlib-devel \
65-
rpmlint \
66-
cmake3 && \
67-
# raise IPv4 priority
68-
echo "precedence ::ffff:0:0/96 100" > /etc/gai.conf && \
69-
# enable multiplatform feature (bundler 2.4.22 is the latest version which supports ruby 2.6)
70-
source /opt/rh/rh-ruby26/enable && gem install --no-document --install-dir /opt/rh/rh-ruby26/root/usr/share/gems bundler:2.4.22 builder && \
71-
scl enable devtoolset-11 bash && \
72-
yum clean ${quiet} all && \
73-
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
23+
# ARG FROM=centos:7
24+
# FROM ${FROM}
25+
#
26+
# COPY qemu-* /usr/bin/
27+
#
28+
# ARG DEBUG
29+
#
30+
# RUN sed -i'' -e 's/^mirrorlist/#mirrorlist/g' \
31+
# -e 's/^#baseurl/baseurl/g' \
32+
# -e 's,mirror.centos.org/centos/$releasever,vault.centos.org/7.9.2009,g' \
33+
# /etc/yum.repos.d/CentOS-Base.repo
34+
#
35+
# RUN \
36+
# quiet=$([ "${DEBUG}" = "yes" ] || echo "--quiet") && \
37+
# yum update -y ${quiet} && \
38+
# yum install -y ${quiet} centos-release-scl && \
39+
# sed -i'' -e 's/^mirrorlist/#mirrorlist/g' \
40+
# -e 's/^# baseurl/baseurl/g' \
41+
# -e 's,mirror.centos.org/centos/7,vault.centos.org/7.9.2009,g' \
42+
# /etc/yum.repos.d/CentOS-SCLo-scl.repo && \
43+
# sed -i'' -e 's/^mirrorlist/#mirrorlist/g' \
44+
# -e 's/^#baseurl/baseurl/g' \
45+
# -e 's,mirror.centos.org/centos/7,vault.centos.org/7.9.2009,g' \
46+
# /etc/yum.repos.d/CentOS-SCLo-scl-rh.repo && \
47+
# yum install -y ${quiet} epel-release && \
48+
# yum groupinstall -y ${quiet} "Development Tools" && \
49+
# yum install -y ${quiet} \
50+
# devtoolset-11 \
51+
# rh-ruby26-ruby-devel \
52+
# rh-ruby26-rubygems \
53+
# rh-ruby26-rubygem-rake \
54+
# rh-ruby26-rubygem-bundler \
55+
# libcap-ng-devel \
56+
# libedit-devel \
57+
# ncurses-devel \
58+
# libyaml-devel \
59+
# libffi-devel \
60+
# git \
61+
# cyrus-sasl-devel \
62+
# nss-softokn-freebl-devel \
63+
# pkg-config \
64+
# rpm-build \
65+
# rpmdevtools \
66+
# redhat-rpm-config \
67+
# openssl-devel \
68+
# tar \
69+
# zlib-devel \
70+
# rpmlint \
71+
# cmake3 && \
72+
# # raise IPv4 priority
73+
# echo "precedence ::ffff:0:0/96 100" > /etc/gai.conf && \
74+
# # enable multiplatform feature (bundler 2.4.22 is the latest version which supports ruby 2.6)
75+
# source /opt/rh/rh-ruby26/enable && gem install --no-document --install-dir /opt/rh/rh-ruby26/root/usr/share/gems bundler:2.4.22 builder && \
76+
# scl enable devtoolset-11 bash && \
77+
# yum clean ${quiet} all && \
78+
# curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y

0 commit comments

Comments
 (0)