Skip to content

Commit

Permalink
Dockerfile simplification
Browse files Browse the repository at this point in the history
  • Loading branch information
frenzymadness committed Jul 17, 2024
1 parent 758f9cc commit 593d4dd
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,11 @@ ENV AUTO_UPDATE_INTERVAL=0 \

RUN microdnf update

RUN microdnf install -y 'yum-utils'
RUN curl http://packages.dev.3sca.net/dev_packages_3sca_net.repo > /etc/yum.repos.d/dev_packages_3sca_net.repo

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

RUN PKGS="openresty-resty-${OPENRESTY_RPM_VERSION} openresty-opentelemetry-${OPENRESTY_RPM_VERSION} openssl-devel git gcc make curl tar openresty-opentracing-${OPENRESTY_RPM_VERSION} openresty-${OPENRESTY_RPM_VERSION} luarocks-${LUAROCKS_VERSION} opentracing-cpp-devel-1.3.0 libopentracing-cpp1-1.3.0 jaegertracing-cpp-client-${JAEGERTRACING_CPP_CLIENT_RPM_VERSION}" && \
RUN PKGS="openresty-resty-${OPENRESTY_RPM_VERSION} openresty-opentelemetry-${OPENRESTY_RPM_VERSION} openssl-devel git-core gcc make curl tar openresty-opentracing-${OPENRESTY_RPM_VERSION} openresty-${OPENRESTY_RPM_VERSION} luarocks-${LUAROCKS_VERSION} opentracing-cpp-devel-1.3.0 libopentracing-cpp1-1.3.0 jaegertracing-cpp-client-${JAEGERTRACING_CPP_CLIENT_RPM_VERSION}" && \
mkdir -p "$HOME" && \
microdnf -y --setopt=tsflags=nodocs install $PKGS && \
microdnf -y --setopt=tsflags=nodocs --setopt=install_weak_deps=0 install $PKGS && \
rpm -V $PKGS && \
microdnf clean all -y

Expand Down Expand Up @@ -63,7 +61,7 @@ RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/man
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/hamish/lua-resty-iputils-0.3.0-1.src.rock
RUN luarocks install --deps-mode=none --tree /usr/local https://luarocks.org/manifests/golgote/net-url-0.9-1.src.rock

RUN microdnf -y remove yum-utils openssl-devel perl-Git-* git annobin-* gcc-plugin-annobin-* gcc luarocks && \
RUN microdnf -y remove libyaml-devel m4 openssl-devel git-core annobin-* gcc-plugin-annobin-* gcc luarocks && \
rm -rf /var/cache/yum && microdnf clean all -y && \
rm -rf ./*

Expand Down

0 comments on commit 593d4dd

Please sign in to comment.