rebase ubi image for ppc64le (kubernetes#98)

stolostron · Jul 29, 2019 · 7437102 · 7437102
1 parent cfa7242
commit 7437102
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 22 deletions.
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
@@ -1,9 +1,11 @@
-FROM BASE_IMAGE
+FROM BASE_IMAGE 
 
 ARG VCS_REF
 ARG VCS_URL
 ARG IMAGE_NAME
 ARG IMAGE_DESCRIPTION
+ARG IMAGE_VENDOR
+ARG IMAGE_SUMMARY
 
 # http://label-schema.org/rc1/
 LABEL org.label-schema.vendor="IBM" \
@@ -12,22 +14,28 @@ LABEL org.label-schema.vendor="IBM" \
       org.label-schema.vcs-ref=$VCS_REF \
       org.label-schema.vcs-url=$VCS_URL \
       org.label-schema.license="Licensed Materials - Property of IBM" \
-      org.label-schema.schema-version="1.0"
+      org.label-schema.schema-version="1.0" \
+      name="$IMAGE_NAME" \
+      vendor="$IMAGE_VENDOR" \
+      description="$IMAGE_DESCRIPTION" \
+      summary="$IMAGE_SUMMARY" 
 
 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 apk update \
-  && apk upgrade \
-  && apk --no-cache add openssl python python-dev py-pip build-base diffutils \
-  && pip install dumb-init \
-  && apk del python python-dev py-pip build-base \
-  && rm -rf /var/cache/apk/* \
+RUN yum update -y \
+  && 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 \
+  && rm -rf dumb-init-1.1.3-17.el7.ppc64le.rpm \
+  && yum clean all \
   && mkdir -p /var/log/nginx \
   && ln -sf /dev/stdout /var/log/nginx/access.log \
   && ln -sf /dev/stderr /var/log/nginx/error.log
 
 COPY rootfs /
 
+ADD packages.yaml License.txt /licenses/
+
 ENTRYPOINT ["/usr/bin/dumb-init"]
 
 CMD ["/icp-management-ingress"]
diff --git a/docker/openresty/1.13.6.2/alpine/Dockerfile.ppc64le b/docker/openresty/1.13.6.2/alpine/Dockerfile.ppc64le
@@ -4,7 +4,7 @@
 ARG RESTY_IMAGE_BASE="ppc64le/alpine"
 ARG RESTY_IMAGE_TAG="latest"
 
-FROM ${RESTY_IMAGE_BASE}:${RESTY_IMAGE_TAG}
+FROM registry.access.redhat.com/ubi7/ubi:7.6
 
 LABEL maintainer="Evan Wies <evan@neomantra.net>"
 
@@ -71,26 +71,40 @@ COPY docker/openresty/1.13.6.2/fips-code/ngx_event_openssl.c /tmp/ngx_event_open
 
 # 1) Install apk dependencies
 # 2) Download and untar OpenSSL, PCRE, and OpenResty
-RUN apk upgrade \
-    && apk add --no-cache --virtual .build-deps \
-        build-base \
+RUN yum install --skip-broken -y wget \
         curl \
-        gd-dev \
-        geoip-dev \
-        libxslt-dev \
+        perl \
+        git \
+        file \
+        libxslt-devel \
         linux-headers \
         make \
-        perl-dev \
-        readline-dev \
-        zlib-dev \
-        git \
+        perl-devel \
+        zlib-devel \
         file \
-    && apk add --no-cache \
         gd \
-        geoip \
+        GeoIP \
         libgcc \
         libxslt \
         zlib \
+        gcc \
+        gcc-c++ \
+        fontconfig-devel \
+        freetype-devel \
+        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 \
     && 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 \
@@ -126,6 +140,7 @@ RUN apk upgrade \
     && cd /tmp/openresty-${RESTY_VERSION} \
     && sed -ire "s/openresty/server/g" `find ./ -name ngx_http_special_response.c` \
     && ./configure -j${RESTY_J} ${_RESTY_CONFIG_DEPS_FIPS} ${RESTY_CONFIG_OPTIONS} ${RESTY_CONFIG_OPTIONS_MORE}  \
+    && sed -i 's/pthread/& -lcrypt/g' /tmp/Makefile \
     && mv /tmp/Makefile /tmp/openresty-${RESTY_VERSION}/build/nginx-1.13.6/objs/Makefile \
     && mv /tmp/ngx_event_openssl.c /tmp/openresty-${RESTY_VERSION}/build/nginx-1.13.6/src/event/ngx_event_openssl.c \
     && cd /tmp/openresty-${RESTY_VERSION} \
@@ -136,6 +151,7 @@ RUN apk upgrade \
     && mv /opt/ibm/router/nginx/sbin/nginx-nofips /opt/ibm/router/nginx/sbin/nginx \
     && ln -sf /opt/ibm/router/nginx/sbin/nginx /opt/ibm/router/bin/openresty \
 # 5) Cleanup
+    && yum clean all \
     && cd /tmp \
     && rm -rf \
         openssl-${RESTY_OPENSSL_VERSION} \
@@ -144,7 +160,6 @@ RUN apk upgrade \
         openssl-${RESTY_OPENSSL_FIPS_VERSION}.tar.gz \
         openresty-${RESTY_VERSION}.tar.gz openresty-${RESTY_VERSION} \
         pcre-${RESTY_PCRE_VERSION}.tar.gz pcre-${RESTY_PCRE_VERSION} \
-    && apk del .build-deps \
     && ln -sf /dev/stdout ${PREFIX_DIR}/nginx/logs/access.log \
     && ln -sf /dev/stderr ${PREFIX_DIR}/nginx/logs/error.log