Skip to content

Commit

Permalink
fix rhel build issue (kubernetes#101)
Browse files Browse the repository at this point in the history
  • Loading branch information
Qing Hao authored and GitHub Enterprise committed Sep 9, 2019
1 parent 21a91d8 commit 2c7315e
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ LABEL org.label-schema.vendor="IBM" \

ENV AUTH_ERROR_PAGE_DIR_PATH=/opt/ibm/router/nginx/conf/errorpages SECRET_KEY_FILE_PATH=/etc/cfc/conf/auth-token-secret OIDC_ENABLE=false ADMINROUTER_ACTIVATE_AUTH_MODULE=true PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/ibm/router/nginx/sbin

RUN yum update -y \
RUN yum update -y --exclude=GeoIP* --exclude=readline* \
&& yum install -y openssl python python-devl \
&& curl -o /etc/yum.repos.d/alsadi-dumb-init-epel-7.repo -sSL https://copr.fedorainfracloud.org/coprs/alsadi/dumb-init/repo/epel-7/alsadi-dumb-init-epel-7.repo \
&& yum install -y dumb-init \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.ppc64le
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ LABEL org.label-schema.vendor="IBM" \

ENV AUTH_ERROR_PAGE_DIR_PATH=/opt/ibm/router/nginx/conf/errorpages SECRET_KEY_FILE_PATH=/etc/cfc/conf/auth-token-secret OIDC_ENABLE=false ADMINROUTER_ACTIVATE_AUTH_MODULE=true PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/ibm/router/nginx/sbin

RUN yum update -y \
RUN yum update -y --exclude=GeoIP* --exclude=readline* \
&& yum install -y openssl python python-devl \
&& wget https://cbs.centos.org/kojifiles/packages/dumb-init/1.1.3/17.el7/ppc64le/dumb-init-1.1.3-17.el7.ppc64le.rpm \
&& yum install -y dumb-init-1.1.3-17.el7.ppc64le.rpm \
Expand Down
2 changes: 1 addition & 1 deletion Makefile.docker
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ image\:tag: %image\:tag:
image\:push: %image\:push:
@$(SELF) -s docker:push-arch
ifneq ($(BUILD_HARNESS_ARCH), s390x)
@$(SELF) -s docker:tag-arch DOCKER_ARCH_URI=$(DOCKER_ARCH_URI)-rhel
@$(SELF) -s docker:push-arch DOCKER_ARCH_URI=$(DOCKER_ARCH_URI)-rhel
endif

.PHONY: image\:release
Expand Down
21 changes: 8 additions & 13 deletions docker/openresty/1.13.6.2/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ARG RESTY_IMAGE_BASE="alpine"
ARG RESTY_IMAGE_TAG="latest"

#FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
FROM registry.access.redhat.com/ubi7/ubi:7.6
FROM registry.access.redhat.com/ubi7/ubi:7.7
LABEL maintainer="Evan Wies <[email protected]>"

# Docker Build Arguments
Expand Down Expand Up @@ -81,7 +81,6 @@ RUN yum install --skip-broken -y wget \
zlib-devel \
file \
gd \
GeoIP \
libgcc \
libxslt \
zlib \
Expand All @@ -92,17 +91,13 @@ RUN yum install --skip-broken -y wget \
libX11-devel \
libXpm-devel \
libjpeg-devel libpng-devel \
&& wget http://mirror.centos.org/centos/7/os/x86_64/Packages/readline-devel-6.2-10.el7.x86_64.rpm \
&& wget http://mirror.centos.org/centos/7/updates/x86_64/Packages/kernel-devel-3.10.0-957.5.1.el7.x86_64.rpm \
&& wget http://mirror.centos.org/centos/7/os/x86_64/Packages/ncurses-devel-5.9-14.20130511.el7_4.x86_64.rpm \
&& wget http://mirror.centos.org/centos/7/os/x86_64/Packages/gd-devel-2.0.35-26.el7.x86_64.rpm \
&& wget http://mirror.centos.org/centos/7/os/x86_64/Packages/GeoIP-devel-1.5.0-13.el7.x86_64.rpm \
&& rpm -ivh GeoIP-devel-1.5.0-13.el7.x86_64.rpm \
&& rpm -ivh ncurses-devel-5.9-14.20130511.el7_4.x86_64.rpm \
&& rpm -ivh readline-devel-6.2-10.el7.x86_64.rpm \
&& rpm -ivh kernel-devel-3.10.0-957.5.1.el7.x86_64.rpm \
&& rpm -ivh gd-devel-2.0.35-26.el7.x86_64.rpm \
&& rm -rf GeoIP-devel-1.5.0-13.el7.x86_64.rpm ncurses-devel-5.9-14.20130511.el7_4.x86_64.rpm readline-devel-6.2-10.el7.x86_64.rpm kernel-devel-3.10.0-957.5.1.el7.x86_64.rpm gd-devel-2.0.35-26.el7.x86_64.rpm \
&& rpm -Uvh --force http://mirror.centos.org/centos-7/7/os/x86_64/Packages/centos-release-7-6.1810.2.el7.centos.x86_64.rpm && sed -i 's/$releasever/7/g' /etc/yum.repos.d/* \
&& yum -y downgrade readline-6.2-10.el7 \
&& yum install --skip-broken -y GeoIP-devel \
ncurses-devel \
readline-devel \
kernel-devel \
gd-devel \
&& cd /tmp \
&& curl -fSL https://www.openssl.org/source/openssl-${RESTY_OPENSSL_VERSION}.tar.gz -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
&& tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
Expand Down
21 changes: 8 additions & 13 deletions docker/openresty/1.13.6.2/alpine/Dockerfile.ppc64le
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
ARG RESTY_IMAGE_BASE="ppc64le/alpine"
ARG RESTY_IMAGE_TAG="latest"

FROM registry.access.redhat.com/ubi7/ubi:7.6
FROM registry.access.redhat.com/ubi7/ubi:7.7

LABEL maintainer="Evan Wies <[email protected]>"

Expand Down Expand Up @@ -83,7 +83,6 @@ RUN yum install --skip-broken -y wget \
zlib-devel \
file \
gd \
GeoIP \
libgcc \
libxslt \
zlib \
Expand All @@ -94,17 +93,13 @@ RUN yum install --skip-broken -y wget \
libX11-devel \
libXpm-devel \
libjpeg-devel libpng-devel \
&& wget http://mirror.centos.org/altarch/7/os/ppc64le/Packages/readline-devel-6.2-10.el7.ppc64le.rpm \
&& wget http://mirror.centos.org/altarch/7/os/ppc64le/Packages/kernel-devel-3.10.0-957.el7.ppc64le.rpm \
&& wget http://mirror.centos.org/altarch/7/os/ppc64le/Packages/ncurses-devel-5.9-14.20130511.el7_4.ppc64le.rpm \
&& wget http://mirror.centos.org/altarch/7/os/ppc64le/Packages/gd-devel-2.0.35-26.el7.ppc64le.rpm \
&& wget http://mirror.centos.org/altarch/7/os/ppc64le/Packages/GeoIP-devel-1.5.0-13.el7.ppc64le.rpm \
&& rpm -ivh GeoIP-devel-1.5.0-13.el7.ppc64le.rpm \
&& rpm -ivh ncurses-devel-5.9-14.20130511.el7_4.ppc64le.rpm \
&& rpm -ivh readline-devel-6.2-10.el7.ppc64le.rpm \
&& rpm -ivh kernel-devel-3.10.0-957.el7.ppc64le.rpm \
&& rpm -ivh gd-devel-2.0.35-26.el7.ppc64le.rpm \
&& rm -rf GeoIP-devel-1.5.0-13.el7.ppc64le.rpm ncurses-devel-5.9-14.20130511.el7_4.ppc64le.rpm readline-devel-6.2-10.el7.ppc64le.rpm kernel-devel-3.10.0-957.el7.ppc64le.rpm gd-devel-2.0.35-26.el7.ppc64le.rpm \
&& rpm -Uvh --force http://mirror.centos.org/altarch/7/os/ppc64le/Packages/centos-release-7-6.1810.2.el7.centos.p.ppc64le.rpm && sed -i 's/$releasever/7/g' /etc/yum.repos.d/* \
&& yum -y downgrade readline-6.2-10.el7 \
&& yum install --skip-broken -y GeoIP-devel \
ncurses-devel \
readline-devel \
kernel-devel \
gd-devel \
&& cd /tmp \
&& curl -fSL https://www.openssl.org/source/openssl-${RESTY_OPENSSL_VERSION}.tar.gz -o openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
&& tar xzf openssl-${RESTY_OPENSSL_VERSION}.tar.gz \
Expand Down

0 comments on commit 2c7315e

Please sign in to comment.