From 6100e2f1ec4d114abeb46e758ec3efe6a917f83d Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Sat, 03 Apr 2021 18:53:14 +0000
Subject: [PATCH] Updated to build on the master
---
Dockerfile | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6d0b52a..056252e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
-FROM arm32v7/openjdk:11-slim
-
+FROM openjdk:15
ENV JENKINS_PORT=8080
ENV JENKINS_HOME=/var/jenkins_home
@@ -7,8 +6,8 @@
ENV JENKINS_UID=506
RUN mkdir -p /tmp/download && cd /tmp/download/ && \
- apt-get update && apt-get install curl git -y && apt-get clean && \
- curl -L https://download.docker.com/linux/static/stable/armhf/docker-19.03.5.tgz | tar -xz -C /tmp/download && \
+ apt-get update && apt-get upgrade -y && apt-get install curl git ttf-dejavu -y && apt-get clean && \
+ curl -s -L https://download.docker.com/linux/static/stable/x86_64/docker-20.10.1.tgz | tar -xz -C /tmp/download && \
rm -rf /tmp/download/docker/dockerd && \
mv /tmp/download/docker/docker* /usr/local/bin/ && \
rm -rf /tmp/download
@@ -17,7 +16,7 @@
groupadd -g 996 docker && \
usermod -aG staff,docker jenkins && \
mkdir -p /opt/jenkins && cd /opt/jenkins && \
- curl -L -O http://mirrors.jenkins.io/war-stable/latest/jenkins.war
+ curl -s -L -O http://mirrors.jenkins.io/war-stable/latest/jenkins.war
VOLUME [ "/var/jenkins_home" ]
@@ -29,4 +28,4 @@
USER 506
-CMD java -jar -Xmx512m -Xms256m /opt/jenkins/jenkins.war --prefix=$PREFIX --httpPort="${JENKINS_PORT}"
+CMD java -jar -Xmx512m -Xms256m /opt/jenkins/jenkins.war --prefix=$PREFIX --httpPort="${JENKINS_PORT}" -Djava.awt.headless=true
--
Gitblit v1.10.0