Skip to content

Commit ad1212a

Browse files
committed
Update base image to ubi-9-minimal
1 parent 22b1e25 commit ad1212a

3 files changed

Lines changed: 25 additions & 37 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1313
### Added
1414
- Update APIcast schema manifest [PR #1550](https://github.com/3scale/APIcast/pull/1550)
1515
- Update luarocks to v3.12.0 [PR #1555](https://github.com/3scale/APIcast/pull/1555)
16+
- Update base image to ubi9-minimal [PR #1566](https://github.com/3scale/APIcast/pull/1566) [THREESCALE-11901](https://issues.redhat.com/browse/THREESCALE-11901)
1617

1718
### Removed
1819

Dockerfile

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
FROM registry.access.redhat.com/ubi8
1+
FROM registry.access.redhat.com/ubi9/ubi-minimal
22

33
ARG OPENRESTY_RPM_VERSION="1.21.4-1.el8"
44
ARG LUAROCKS_VERSION="3.11.1"
5-
ARG JAEGERTRACING_CPP_CLIENT_RPM_VERSION="0.3.1-13.el8"
65

76
LABEL summary="The 3scale API gateway (APIcast) is an OpenResty application, which consists of two parts: NGINX configuration and Lua files." \
87
description="APIcast is not a standalone API gateway therefore it needs connection to the 3scale API management platform. The container includes OpenResty and uses LuaRocks to install dependencies (rocks are installed in the application folder)." \
@@ -20,21 +19,16 @@ ENV AUTO_UPDATE_INTERVAL=0 \
2019
PATH=/opt/app-root/src/bin:/opt/app-root/bin:$PATH \
2120
PLATFORM="el8"
2221

23-
RUN PKGS="perl-interpreter-5.26.3 libyaml-devel-0.1.7 m4 openssl-devel git gcc make curl" && \
24-
mkdir -p "$HOME" && \
25-
yum -y --setopt=tsflags=nodocs install $PKGS && \
26-
rpm -V $PKGS && \
27-
yum clean all -y
28-
29-
RUN dnf install -y 'dnf-command(config-manager)'
22+
RUN microdnf update -y \
23+
&& microdnf install -y 'yum-utils' dnf
3024

31-
RUN yum config-manager --add-repo http://packages.dev.3sca.net/dev_packages_3sca_net.repo
25+
RUN yum-config-manager --add-repo http://packages.dev.3sca.net/dev_packages_3sca_net.repo
3226

3327
RUN PKGS="openresty-resty-${OPENRESTY_RPM_VERSION} openresty-opentelemetry-${OPENRESTY_RPM_VERSION} openresty-${OPENRESTY_RPM_VERSION} luarocks-${LUAROCKS_VERSION}" && \
3428
mkdir -p "$HOME" && \
35-
yum -y --setopt=tsflags=nodocs install $PKGS && \
29+
dnf -y --setopt=tsflags=nodocs install $PKGS && \
3630
rpm -V $PKGS && \
37-
yum clean all -y
31+
dnf clean all -y
3832

3933
COPY site_config.lua /usr/share/lua/5.1/luarocks/site_config.lua
4034
COPY config-*.lua /usr/local/openresty/config-5.1.lua
@@ -61,18 +55,12 @@ RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/man
6155
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/golgote/net-url-0.9-1.src.rock
6256
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/membphis/lua-resty-ipmatcher-0.6.1-0.src.rock
6357
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/fffonion/lua-resty-openssl-1.5.1-1.src.rock
58+
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/tkan145/lua-resty-jwt-0.2.4-0.src.rock
6459

65-
# Install lua-resty-jwt from source due to Authentication Bypass bug
66-
# See https://github.com/cdbattags/lua-resty-jwt/issues/61
67-
RUN cd /tmp \
68-
&& git clone --recurse-submodules https://github.com/cdbattags/lua-resty-jwt \
69-
&& cd lua-resty-jwt \
70-
&& git reset --hard d1558e2 \
71-
&& luarocks make --tree /usr/local lua-resty-jwt-dev-0.rockspec
72-
73-
RUN yum -y remove libyaml-devel m4 openssl-devel git gcc luarocks && \
74-
rm -rf /var/cache/yum && yum clean all -y && \
75-
rm -rf ./*
60+
RUN dnf -y remove yum-utils luarocks \
61+
&& rm -rf /var/cache/yum /var/cache/dnf \
62+
&& dnf clean all -y \
63+
&& rm -rf ./*
7664

7765
COPY gateway/. /opt/app-root/src/
7866

Dockerfile.devel

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi8
1+
FROM registry.access.redhat.com/ubi9/ubi-minimal
22

33
ARG OPENRESTY_RPM_VERSION="1.21.4-1.el8"
44
ARG LUAROCKS_VERSION="3.12.0"
@@ -12,24 +12,22 @@ ENV APP_ROOT=/opt/app-root \
1212
PATH=/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin \
1313
PLATFORM="el8"
1414

15-
RUN sed -i s/enabled=./enabled=0/g /etc/yum/pluginconf.d/subscription-manager.conf
15+
RUN microdnf update -y \
16+
&& microdnf install -y 'yum-utils' dnf
1617

17-
RUN yum upgrade -y
18-
19-
RUN dnf install -y 'dnf-command(config-manager)'
20-
21-
RUN yum install -y \
22-
gcc make git which curl iputils bind-utils expat-devel kernel-headers openssl-devel m4 \
23-
libyaml libyaml-devel perl-local-lib perl-App-cpanminus perl-LWP-Protocol-https
18+
RUN dnf install -y \
19+
gcc make git which iputils bind-utils expat-devel kernel-headers openssl-devel m4 \
20+
libyaml libyaml-devel perl-local-lib perl-App-cpanminus perl-LWP-Protocol-https \
21+
tar
2422

2523
# perl-Test-Nginx
2624
RUN cpanm --notest IPC::Run && \
2725
cpanm https://cpan.metacpan.org/authors/id/A/AG/AGENT/Test-Nginx-0.29.tar.gz && \
2826
cpanm https://cpan.metacpan.org/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.14.tar.gz
2927

30-
RUN yum config-manager --add-repo http://packages.dev.3sca.net/dev_packages_3sca_net.repo
28+
RUN yum-config-manager --add-repo http://packages.dev.3sca.net/dev_packages_3sca_net.repo
3129

32-
RUN yum install -y \
30+
RUN dnf install -y \
3331
openresty-${OPENRESTY_RPM_VERSION} \
3432
openresty-resty-${OPENRESTY_RPM_VERSION} \
3533
openresty-opentelemetry-${OPENRESTY_RPM_VERSION}
@@ -57,16 +55,17 @@ RUN cd /tmp \
5755
--with-lua-include=/usr/local/openresty/luajit/include/luajit-2.1 \
5856
&& make build \
5957
&& make install \
60-
&& luarocks install luaossl 20200709 --tree ${APP_ROOT}/lua_modules CFLAGS="-O2 -fPIC -DHAVE_EVP_KDF_CTX=1" \
58+
# && luarocks install luaossl 20200709 --tree ${APP_ROOT}/lua_modules CFLAGS="-O2 -fPIC -DHAVE_EVP_KDF_CTX=1" \
6159
&& luarocks install http --tree ${APP_ROOT}/lua_modules \
6260
&& cd /tmp \
6361
&& rm -rf luarocks-${LUAROCKS_VERSION} luarocks-${LUAROCKS_VERSION}.tar.gz \
6462
&& curl -fSL https://github.com/3scale/lua-rover/archive/refs/tags/v${LUAROVER_VERSION}.tar.gz -o lua-rover-v${LUAROVER_VERSION}.tar.gz \
6563
&& tar xzf lua-rover-v${LUAROVER_VERSION}.tar.gz \
6664
&& cd lua-rover-${LUAROVER_VERSION} \
6765
&& luarocks make \
68-
&& yum -y remove luarocks \
69-
&& rm -rf /var/cache/yum && yum clean all -y
66+
&& dnf -y remove luarocks \
67+
&& rm -rf /var/cache/yum /var/cache/dnf \
68+
&& dnf clean all -y
7069

7170
# Directory with the sources is set as the working directory so all STI scripts
7271
# can execute relative to this path.

0 commit comments

Comments
 (0)