Skip to content

Commit

Permalink
Updated Jenkins Test File (#1495)
Browse files Browse the repository at this point in the history
* Remove unneeded dependencies. Remove --version since script does not take in parameters.

* Resolving issue with missing testResults
  • Loading branch information
Jim Crowley authored and Shelley Lambert committed Dec 11, 2019
1 parent 5aa16de commit 1a129cf
Showing 1 changed file with 11 additions and 22 deletions.
33 changes: 11 additions & 22 deletions external/jenkins/dockerfile/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# If you want to build image based on other images, please use
# `--build-arg list` to specify your base image
#
# Build example: `docker build --build-arg IMAGE_NAME=<image_name> --build-arg IMAGE_VERSION=<image_version >-t adoptopenjdk-jenkins-test .`
# Build example: `docker build --build-arg IMAGE_NAME=<image_name> --build-arg IMAGE_VERSION=<image_version > -t adoptopenjdk-jenkins-test .`

ARG SDK=openjdk8
ARG IMAGE_NAME=adoptopenjdk/$SDK
Expand All @@ -29,33 +29,22 @@ ARG IMAGE_VERSION=latest
FROM $IMAGE_NAME:$IMAGE_VERSION

# Install test dependent executable files
RUN apt-get update \
&& apt-get -y install \
ant \
apt-transport-https \
ca-certificates \
dirmngr \
curl \
git \
make \
unzip \
vim \
wget

# Install jenkins tests dependent
RUN apt-get update \
&& apt-get -y install \
maven

RUN apt-get update; \
apt-get install -y --no-install-recommends \
git \
maven \
; \
rm -rf /var/lib/apt/lists/*

ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"

# This is the main script to run jenkins tests
COPY ./dockerfile/jenkins-test.sh /jenkins-test.sh

# Clone jenkins src to /jenkins
WORKDIR /
RUN mkdir testResults

# Clone jenkins src to /jenkins
RUN git clone https://github.com/jenkinsci/jenkins.git

ENTRYPOINT ["/bin/bash", "/jenkins-test.sh"]
CMD ["--version"]
ENTRYPOINT ["/bin/bash", "/jenkins-test.sh"]

0 comments on commit 1a129cf

Please sign in to comment.