mirror of
https://github.com/spring-projects/spring-petclinic.git
synced 2025-07-19 14:05:50 +00:00
Rework jnlp container
This commit is contained in:
parent
869ab61274
commit
164a8d3701
2 changed files with 4 additions and 25 deletions
|
@ -12,9 +12,9 @@ ENTRYPOINT ["/entrypoint.sh"]
|
|||
RUN mkdir -p ${BASE_DIR}
|
||||
|
||||
COPY entrypoint.sh /entrypoint.sh
|
||||
RUN chmod +x /docker-entrypoint.sh
|
||||
RUN chmod +x /entrypoint.sh
|
||||
|
||||
COPY todo.jar /udc/apps/petclinic/todo.jar
|
||||
COPY udc-backend-*.jar /udc/apps/petclinic/todo.jar
|
||||
|
||||
LABEL project.groupid="${project.groupId}" \
|
||||
project.artifactid="${project.artifactId}" \
|
||||
|
|
|
@ -1,29 +1,8 @@
|
|||
FROM jenkinsci/jnlp-slave
|
||||
|
||||
ENV CLOUDSDK_CORE_DISABLE_PROMPTS 1
|
||||
ENV PATH /opt/google-cloud-sdk/bin:${PATH}
|
||||
|
||||
USER root
|
||||
FROM gcr.io/cloud-solutions-images/jenkins-k8s-slave
|
||||
|
||||
RUN apt-get update -y
|
||||
RUN apt-get install -y jq \
|
||||
unzip \
|
||||
maven \
|
||||
apt-transport-https \
|
||||
ca-certificates \
|
||||
gnupg2 \
|
||||
software-properties-common
|
||||
maven
|
||||
|
||||
RUN curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "${ID}")/gpg > /tmp/dkey; apt-key add /tmp/dkey \
|
||||
&& add-apt-repository \
|
||||
"deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "${ID}") \
|
||||
$(lsb_release -cs) \
|
||||
stable" \
|
||||
&& apt-get update \
|
||||
&& apt-get -y install docker-ce
|
||||
|
||||
RUN curl https://sdk.cloud.google.com | bash && mv google-cloud-sdk /opt
|
||||
RUN gcloud components install kubectl
|
||||
RUN curl -sfSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
|
||||
|
||||
USER jenkins
|
||||
|
|
Loading…
Reference in a new issue