File tree 2 files changed +8
-12
lines changed
2 files changed +8
-12
lines changed Original file line number Diff line number Diff line change @@ -75,11 +75,9 @@ RUN rpm -i ${IPSET_SOURCERPM_URL} && \
75
75
76
76
# runit is not available in ubi or CentOS repos so build it.
77
77
# get it from the debian repos as the official website doesn't support https
78
- RUN wget -P /tmp https://ftp.debian.org/debian/pool/main/r/runit/runit_${RUNIT_VER}.orig.tar.gz && \
79
- gunzip /tmp/runit_${RUNIT_VER}.orig.tar.gz && \
80
- tar -xpf /tmp/runit_${RUNIT_VER}.orig.tar -C /tmp && \
81
- cd /tmp/admin/runit-${RUNIT_VER}/ && \
82
- package/install
78
+ RUN curl -sfL https://ftp.debian.org/debian/pool/main/r/runit/runit_${RUNIT_VER}.orig.tar.gz | tar xz -C /root && \
79
+ cd /root/admin/runit-${RUNIT_VER} && \
80
+ package/compile
83
81
84
82
FROM ${UBI_IMAGE} as ubi
85
83
@@ -93,7 +91,7 @@ ARG RUNIT_VER
93
91
RUN microdnf upgrade
94
92
95
93
# Copy in runit binaries
96
- COPY --from=centos /tmp /admin/runit-${RUNIT_VER}/command/* /usr/local/bin/
94
+ COPY --from=centos /root /admin/runit-${RUNIT_VER}/command/* /usr/local/bin/
97
95
98
96
# Copy in our rpms
99
97
COPY --from=centos /root/rpmbuild/RPMS/x86_64/* /tmp/rpms/
Original file line number Diff line number Diff line change @@ -81,11 +81,9 @@ RUN rpm -i ${IPSET_SOURCERPM_URL} && \
81
81
82
82
# runit is not available in ubi or CentOS repos so build it.
83
83
# get it from the debian repos as the official website doesn't support https
84
- RUN wget -P /tmp https://ftp.debian.org/debian/pool/main/r/runit/runit_${RUNIT_VER}.orig.tar.gz && \
85
- gunzip /tmp/runit_${RUNIT_VER}.orig.tar.gz && \
86
- tar -xpf /tmp/runit_${RUNIT_VER}.orig.tar -C /tmp && \
87
- cd /tmp/admin/runit-${RUNIT_VER}/ && \
88
- package/install
84
+ RUN curl -sfL https://ftp.debian.org/debian/pool/main/r/runit/runit_${RUNIT_VER}.orig.tar.gz | tar xz -C /root && \
85
+ cd /root/admin/runit-${RUNIT_VER} && \
86
+ package/compile
89
87
90
88
FROM ${UBI_IMAGE} as ubi
91
89
@@ -103,7 +101,7 @@ COPY --from=qemu /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
103
101
RUN microdnf upgrade
104
102
105
103
# Copy in runit binaries
106
- COPY --from=centos /tmp /admin/runit-${RUNIT_VER}/command/* /usr/local/bin/
104
+ COPY --from=centos /root /admin/runit-${RUNIT_VER}/command/* /usr/local/bin/
107
105
108
106
# Copy in our rpms
109
107
COPY --from=centos /root/rpmbuild/RPMS/aarch64/* /tmp/rpms/
You can’t perform that action at this time.
0 commit comments