-
Notifications
You must be signed in to change notification settings - Fork 304
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HPCC-33262 Ensure rpm-build is available in CentOS 7 builds
Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
- Loading branch information
1 parent
83ae5d1
commit a2d1a9b
Showing
6 changed files
with
20 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
ARG VCPKG_REF=latest | ||
FROM hpccsystems/platform-build-base-amazonlinux:$VCPKG_REF | ||
|
||
RUN yum install -y \ | ||
rpm-build && \ | ||
yum -y clean all && rm -rf /var/cache | ||
|
||
ENTRYPOINT ["/bin/bash", "--login", "-c"] | ||
|
||
CMD ["/bin/bash"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
ARG VCPKG_REF=latest | ||
FROM hpccsystems/platform-build-base-centos-7:$VCPKG_REF | ||
|
||
RUN yum install -y \ | ||
rpm-build && \ | ||
yum -y clean all && rm -rf /var/cache | ||
|
||
ENTRYPOINT ["/bin/bash", "--login", "-c"] | ||
|
||
CMD ["/bin/bash"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,10 @@ | ||
ARG VCPKG_REF=latest | ||
FROM hpccsystems/platform-build-base-centos-8:$VCPKG_REF | ||
|
||
RUN yum install -y \ | ||
rpm-build && \ | ||
yum -y clean all && rm -rf /var/cache | ||
|
||
ENTRYPOINT ["/bin/bash", "--login", "-c"] | ||
|
||
CMD ["/bin/bash"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
ARG VCPKG_REF=latest | ||
FROM hpccsystems/platform-build-base-rockylinux-8:$VCPKG_REF | ||
|
||
ENTRYPOINT ["/bin/bash", "--login", "-c"] | ||
|
||
RUN yum install -y \ | ||
rpm-build && \ | ||
yum -y clean all && rm -rf /var/cache | ||
|
||
ENTRYPOINT ["/bin/bash", "--login", "-c"] | ||
|
||
CMD ["/bin/bash"] |
Submodule vcpkg
updated
9 files
+1 −0 | .dockerignore | |
+1 −2 | .github/workflows/prebuild-docker.yml | |
+9 −7 | .github/workflows/prebuild-gh_envs.yml | |
+44 −0 | dockerfiles/CentOS-Base.repo | |
+4 −4 | dockerfiles/build.sh | |
+5 −5 | dockerfiles/centos-7.dockerfile | |
+4 −1 | dockerfiles/centos-8.dockerfile | |
+119 −0 | vcpkg-win2022.json | |
+1 −1 | vcpkg.json |