Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

created a patch that modifies #590

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

created a patch that modifies #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/travis/Dockerfile-opflex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3
RUN microdnf install -y yum yum-utils
RUN yum update -y --nogpgcheck --disablerepo=* --repofrompath=centos,https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os --repofrompath=centos-app,https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os && rm -rf /var/cache/yum
RUN yum install -y --nogpgcheck --disablerepo=* --repofrompath=centos,https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os --repofrompath=centos-app,https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os \
RUN yum update -y --nogpgcheck --disablerepo=* --repofrompath=centos,https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/os --repofrompath=centos-app,https://mirror.stream.centos.org/9-stream/AppStream/aarch64/os && rm -rf /var/cache/yum
RUN yum install -y --nogpgcheck --disablerepo=* --repofrompath=centos,https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/os --repofrompath=centos-app,https://mirror.stream.centos.org/9-stream/AppStream/aarch64/os \
libstdc++ libuv \
boost-program-options boost-system boost-date-time boost-filesystem \
boost-iostreams libnetfilter_conntrack net-tools procps-ng ca-certificates \
Expand Down
8 changes: 4 additions & 4 deletions docker/travis/Dockerfile-opflex-build-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3
ENV ROOT=/usr/local
ARG make_args=-j1
RUN microdnf install -y yum yum-utils \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/CRB/x86_64/os \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/AppStream/x86_64/debug/tree \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/os \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/AppStream/aarch64/os \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/CRB/aarch64/os/ \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/AppStream/aarch64/debug/tree \
&& yum --nogpgcheck -y update
RUN yum --nogpgcheck install -y \
libtool pkgconfig autoconf automake make cmake file python3-six \
Expand Down
4 changes: 2 additions & 2 deletions docker/travis/Dockerfile-opflexserver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.3
RUN microdnf install -y yum yum-utils \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/AppStream/x86_64/os \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/BaseOS/aarch64/os \
&& yum-config-manager --add-repo=https://mirror.stream.centos.org/9-stream/AppStream/aarch64/os \
&& yum --nogpgcheck -y update
RUN yum --nogpgcheck --disablerepo=\*ubi\* install -y libstdc++ libuv \
boost-program-options boost-system boost-date-time boost-filesystem \
Expand Down
8 changes: 4 additions & 4 deletions docker/travis/build-opflex-travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set -Eeuxo pipefail

echo "starting opflex build"

docker build $BUILDARG $SECOPT -t $DOCKER_HUB_ID/opflex-build-base:$DOCKER_TAG -f $DOCKER_DIR/Dockerfile-opflex-build-base . &> /tmp/opflex-build-base.log &
docker buildx build $BUILDARG $SECOPT --platform linux/arm64 -t $DOCKER_HUB_ID/opflex-build-base:$DOCKER_TAG -f $DOCKER_DIR/Dockerfile-opflex-build-base . &> /tmp/opflex-build-base.log &
while [ ! -f /tmp/opflex-build-base.log ]; do sleep 10; done
tail -f /tmp/opflex-build-base.log | awk 'NR%100-1==0' &

Expand All @@ -45,8 +45,8 @@ tar cvfz opflex.tgz opflex
cp opflex.tgz opflex/
popd

docker build $BUILDARG --build-arg DOCKER_HUB_ID=$DOCKER_HUB_ID --build-arg DOCKER_TAG=$DOCKER_TAG $SECOPT -t $DOCKER_HUB_ID/opflex-build:$DOCKER_TAG -f $DOCKER_DIR/Dockerfile-opflex-build $OPFLEX_DIR &> /tmp/opflex-build.log &
#docker build $SECOPT -t $DOCKER_HUB_ID/opflex-build:$DOCKER_TAG -f $DOCKER_DIR/Dockerfile-opflex-build $OPFLEX_DIR
docker buildx build $BUILDARG --build-arg DOCKER_HUB_ID=$DOCKER_HUB_ID --build-arg DOCKER_TAG=$DOCKER_TAG $SECOPT --platform linux/arm64 -t $DOCKER_HUB_ID/opflex-build:$DOCKER_TAG -f $DOCKER_DIR/Dockerfile-opflex-build $OPFLEX_DIR &> /tmp/opflex-build.log &
#docker buildx build $SECOPT --platform linux/arm64 -t $DOCKER_HUB_ID/opflex-build:$DOCKER_TAG -f $DOCKER_DIR/Dockerfile-opflex-build $OPFLEX_DIR
##docker push $DOCKER_HUB_ID/opflex-build$DOCKER_TAG
while [ ! -f /tmp/opflex-build.log ]; do sleep 10; done
tail -f /tmp/opflex-build.log | awk 'NR%100-1==0' &
Expand Down Expand Up @@ -124,4 +124,4 @@ mkdir build/opflex/dist/licenses
cp $DOCKER_DIR/../licenses/* build/opflex/dist/licenses

#######################################################################################
docker build $BUILDARG -t $DOCKER_HUB_ID/opflex:$DOCKER_TAG -f ./build/opflex/dist/Dockerfile-opflex build/opflex/dist
docker buildx build $BUILDARG --platform linux/arm64 -t $DOCKER_HUB_ID/opflex:$DOCKER_TAG -f ./build/opflex/dist/Dockerfile-opflex build/opflex/dist