Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions grove/integration_test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
# specific language governing permissions and limitations
# under the License.

FROM centos:7
FROM rockylinux:8

RUN yum -y --setopt=tsflags=nodocs update && \
yum -y --setopt=tsflags=nodocs install httpd && \
yum -y --setopt=tsflags=nodocs install perl && \
yum -y --setopt=tsflags=nodocs install git && \
yum -y --setopt=tsflags=nodocs install golang && \
yum -y --setopt=tsflags=nodocs install openssl && \
yum clean all
RUN dnf -y --setopt=tsflags=nodocs update && \
dnf -y --setopt=tsflags=nodocs install httpd && \
dnf -y --setopt=tsflags=nodocs install perl && \
dnf -y --setopt=tsflags=nodocs install git && \
dnf -y --setopt=tsflags=nodocs install golang && \
dnf -y --setopt=tsflags=nodocs install openssl && \
dnf clean all

#EXPOSE 80

Expand Down
19 changes: 9 additions & 10 deletions infrastructure/ansible/sample.lab/Ansible.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,22 @@
# limitations under the License.
#

FROM centos:7.4.1708
MAINTAINER Jonathan Gray
RUN yum -y install epel-release \
&& yum -y install \
FROM rockylinux:8
RUN dnf -y install epel-release \
&& dnf -y install \
ansible \
git \
python-pip \
python-devel \
python3-pip \
python3-devel \
libxml2-devel \
libxslt-devel \
libffi-devel \
openssl-devel \
gcc \
&& yum clean all \
&& pip install --upgrade pip \
&& pip install --upgrade setuptools \
&& pip install --upgrade pyOpenSSL python-gilt paramiko Jinja2
&& dnf clean all \
&& pip3 install --upgrade pip \
&& pip3 install --upgrade setuptools \
&& pip3 install --upgrade pyOpenSSL python-gilt paramiko Jinja2
RUN mkdir -p /opt/atc/ && mkdir ~/.ssh && echo -e "Host *\n StrictHostKeyChecking no\n UserKnownHostsFile=/dev/null" > ~/.ssh/config
COPY . /opt/atc

Expand Down
10 changes: 5 additions & 5 deletions traffic_router/tests/Dockerfile-test-centos
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM centos:7
FROM rockylinux:8
ARG DIR=github.com/apache/trafficcontrol

VOLUME ["/junit"]

WORKDIR /go/src/$DIR/traffic_router

RUN set -o errexit; \
yum -y update; \
yum -y install \
dnf -y update; \
dnf -y install \
maven \
java-11-openjdk \
epel-release; \
yum -y install tomcat-native; \
yum -y clean all
dnf -y install tomcat-native; \
dnf -y clean all

ADD traffic_router /go/src/$DIR/traffic_router

Expand Down