From 3d64be1a429541f2aaa9234b8182879e57994cd9 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 19 Feb 2021 12:09:16 +0000 Subject: [PATCH] unixPB: Add apt-get update to second apt-get install step in dockerhost role Signed-off-by: Stewart X Addison --- .../roles/DockerStatic/Dockerfiles/Dockerfile.u1604 | 3 ++- .../roles/DockerStatic/Dockerfiles/Dockerfile.u1804 | 3 ++- .../roles/DockerStatic/Dockerfiles/Dockerfile.u2004 | 3 +-- .../roles/DockerStatic/Dockerfiles/Dockerfile.u2010 | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1604 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1604 index 7cc36776a2..77f6d3343a 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1604 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1604 @@ -1,5 +1,6 @@ FROM ubuntu:16.04 +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -qq -y perl openssh-server unzip # Get java8 RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz @@ -20,7 +21,7 @@ RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh RUN service ssh start CMD ["/usr/sbin/sshd","-D"] -RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 +RUN apt-get update && apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 # Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1804 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1804 index 1a6088b6ef..c2806d59f9 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1804 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u1804 @@ -1,5 +1,6 @@ FROM ubuntu:18.04 +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -qq -y perl openssh-server unzip # Get java8 RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz @@ -20,7 +21,7 @@ RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh RUN service ssh start CMD ["/usr/sbin/sshd","-D"] -RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 +RUN apt-get update && apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 # Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2004 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2004 index be71f84d0d..ec668de4e9 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2004 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2004 @@ -1,6 +1,5 @@ FROM ubuntu:20.04 -# Without noninteractive Ubuntu 20.04 waits installing tzdata packae ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -qq -y perl openssh-server unzip # Get java8 @@ -22,7 +21,7 @@ RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh RUN service ssh start CMD ["/usr/sbin/sshd","-D"] -RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 +RUN apt-get update && apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 # Start with docker run -p 2222:22 UUID diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2010 b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2010 index 86eec5e581..1c82bb68fb 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2010 +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles/Dockerfile.u2010 @@ -1,5 +1,6 @@ FROM ubuntu:20.10 +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -qq -y perl openssh-server unzip # Get java8 RUN wget -q 'https://api.adoptopenjdk.net/v2/binary/releases/openjdk8?openjdk_impl=hotspot&os=linux&arch=x64&release=latest&type=jdk' -O /tmp/jdk8.tar.gz @@ -20,7 +21,7 @@ RUN chown -R jenkins /home/jenkins/.ssh RUN chmod -R og-rwx /home/jenkins/.ssh RUN service ssh start CMD ["/usr/sbin/sshd","-D"] -RUN apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 +RUN apt-get update && apt-get install -qq -y git curl make gcc xvfb libxrender1 libxi6 libxtst6 # ENTRYPOINT /usr/lib/jvm/jdk8/bin/java EXPOSE 22 # Start with docker run -p 2222:22 UUID