From 0f57c1321034bb71bbcd173ac6a82fe85c56f2f6 Mon Sep 17 00:00:00 2001
From: Chris Pomeroy <chris.pomeroy@hotmail.com>
Date: Sat, 02 Jan 2021 20:34:20 +0000
Subject: [PATCH] Updated to run on x86_64
---
Dockerfile | 9 ++++-----
docker-compose.yml | 4 ++--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 17787f0..a278994 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
-FROM arm32v7/openjdk:11-slim
-
+FROM openjdk:11
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 upgrade -y && 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 -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
@@ -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
diff --git a/docker-compose.yml b/docker-compose.yml
index f71cba4..bdfa757 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@
services:
jenkins:
- image: dev-reg.darkurthe.net/jenkins
+ image: dev-reg.darkurthe.net/jenkins:3
networks:
agents:
traefik_default:
@@ -19,7 +19,7 @@
placement:
constraints:
- node.platform.os == linux
- - node.platform.arch == armv7l
+ - node.platform.arch == x86_64
resources:
reservations:
memory: 512m
--
Gitblit v1.10.0