Commit bb8fa8b1 by Feanil Patel

Upgrade GoCD to 17.1

This also means an update to java-8.
parent 10c87e65
# Build using: docker build -f Dockerfile.gocd-agent -t gocd-agent . # Build using: docker build -f Dockerfile.gocd-agent -t gocd-agent .
FROM gocd/gocd-agent:16.5.0 FROM gocd/gocd-agent:17.1.0
LABEL version="0.02" \ LABEL version="0.02" \
description="This custom go-agent docker file installs additional requirements for the edx pipeline" description="This custom go-agent docker file installs additional requirements for the edx pipeline"
# Add Custom apt repositories # Add Custom apt repositories
RUN \ RUN \
echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \ echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
add-apt-repository -y ppa:webupd8team/java && \ add-apt-repository -y ppa:webupd8team/java && \
add-apt-repository -y 'deb http://ppa.edx.org trusty main' && \ add-apt-repository -y 'deb http://ppa.edx.org trusty main' && \
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 69464050 && \ apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 69464050 && \
...@@ -14,9 +14,9 @@ RUN \ ...@@ -14,9 +14,9 @@ RUN \
# Install Java 7 # Install Java 7
RUN \ RUN \
apt-get install -y oracle-java7-installer && \ apt-get install -y oracle-java8-installer && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
rm -rf /var/cache/oracle-jdk7-installer rm -rf /var/cache/oracle-jdk8-installer
# Install a modern git client # Install a modern git client
RUN add-apt-repository -y ppa:git-core/ppa && \ RUN add-apt-repository -y ppa:git-core/ppa && \
...@@ -27,7 +27,7 @@ RUN add-apt-repository -y ppa:git-core/ppa && \ ...@@ -27,7 +27,7 @@ RUN add-apt-repository -y ppa:git-core/ppa && \
WORKDIR /data WORKDIR /data
# Define commonly used JAVA_HOME variable # Define commonly used JAVA_HOME variable
ENV JAVA_HOME /usr/lib/jvm/java-7-oracle ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
# Install Python and package mgmt tools. # Install Python and package mgmt tools.
RUN apt-get update && apt-get install -y -q \ RUN apt-get update && apt-get install -y -q \
...@@ -78,7 +78,7 @@ RUN pip install awscli ...@@ -78,7 +78,7 @@ RUN pip install awscli
ADD docker/build/go-agent/files/go-agent-start.sh /etc/service/go-agent/run ADD docker/build/go-agent/files/go-agent-start.sh /etc/service/go-agent/run
ADD docker/build/go-agent/files/go-agent-env-vars /etc/default/go-agent ADD docker/build/go-agent/files/go-agent-env-vars /etc/default/go-agent
RUN update-java-alternatives -s java-7-oracle RUN update-java-alternatives -s java-8-oracle
# !!!!NOTICE!!!! ---- Runner of this pipeline take heed!! You must replace go_github_key.pem with the REAL key material # !!!!NOTICE!!!! ---- Runner of this pipeline take heed!! You must replace go_github_key.pem with the REAL key material
# that can checkout private github repositories used as pipeline materials. The key material here is faked and is only # that can checkout private github repositories used as pipeline materials. The key material here is faked and is only
......
...@@ -13,23 +13,23 @@ ...@@ -13,23 +13,23 @@
GO_SERVER_SERVICE_NAME: "go-server" GO_SERVER_SERVICE_NAME: "go-server"
GO_SERVER_USER: "go" GO_SERVER_USER: "go"
GO_SERVER_GROUP: "{{ GO_SERVER_USER }}" GO_SERVER_GROUP: "{{ GO_SERVER_USER }}"
GO_SERVER_VERSION: "16.5.0-3305" GO_SERVER_VERSION: "17.1.0-4511"
GO_SERVER_HOME: "/var/lib/go-server" GO_SERVER_HOME: "/var/lib/go-server"
GO_SERVER_CONF_HOME: "/etc/go" GO_SERVER_CONF_HOME: "/etc/go"
GO_SERVER_PLUGIN_DIR: "{{ GO_SERVER_HOME }}/plugins/external/" GO_SERVER_PLUGIN_DIR: "{{ GO_SERVER_HOME }}/plugins/external/"
# Java version settings # Java version settings
GO_SERVER_ORACLEJDK_VERSION: "7u80" GO_SERVER_ORACLEJDK_VERSION: "8u65"
GO_SERVER_ORACLEJDK_BASE: "jdk1.7.0_80" GO_SERVER_ORACLEJDK_BASE: "jdk1.8.0_65"
GO_SERVER_ORACLEJDK_BUILD: "b15" GO_SERVER_ORACLEJDK_BUILD: "b17"
GO_SERVER_ORACLEJDK_LINK: "/usr/lib/jvm/java-7-oracle" GO_SERVER_ORACLEJDK_LINK: "/usr/lib/jvm/java-8-oracle"
# java tuning # java tuning
GO_SERVER_JAVA_HOME: "{{ GO_SERVER_ORACLEJDK_LINK }}" GO_SERVER_JAVA_HOME: "{{ GO_SERVER_ORACLEJDK_LINK }}"
# Aptitude settings # Aptitude settings
GO_SERVER_APT_SOURCE: "deb https://download.go.cd /" GO_SERVER_APT_SOURCE: "deb https://download.gocd.io /"
GO_SERVER_APT_KEY_URL: "https://download.go.cd/GOCD-GPG-KEY.asc" GO_SERVER_APT_KEY_URL: "https://download.gocd.io/GOCD-GPG-KEY.asc"
GO_SERVER_APT_NAME: "go-server" GO_SERVER_APT_NAME: "go-server"
GO_SERVER_APT_PKGS: ["apache2-utils"] GO_SERVER_APT_PKGS: ["apache2-utils"]
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
# Deploys go-server using aptitude! # Deploys go-server using aptitude!
# #
# Dependencies: # Dependencies:
# - openjdk7 # - openjdk8
# #
# Example play: # Example play:
# #
...@@ -69,8 +69,7 @@ ...@@ -69,8 +69,7 @@
mode: 0776 mode: 0776
owner: "{{ GO_SERVER_USER }}" owner: "{{ GO_SERVER_USER }}"
group: "{{ GO_SERVER_GROUP }}" group: "{{ GO_SERVER_GROUP }}"
# uncomment ansible has been upgraded to 2.0+ checksum: "md5:{{ item.md5 }}"
# checksum=md5:{{ item.md5 }}
with_items: with_items:
- { url: "{{ GO_SERVER_OAUTH_LOGIN_JAR_URL }}", md5: "{{ GO_SERVER_OAUTH_LOGIN_MD5 }}" } - { url: "{{ GO_SERVER_OAUTH_LOGIN_JAR_URL }}", md5: "{{ GO_SERVER_OAUTH_LOGIN_MD5 }}" }
- { url: "{{ GO_SERVER_GITHUB_PR_PLUGIN_JAR_URL }}", md5: "{{ GO_SERVER_GITHUB_PR_PLUGIN_MD5 }}" } - { url: "{{ GO_SERVER_GITHUB_PR_PLUGIN_JAR_URL }}", md5: "{{ GO_SERVER_GITHUB_PR_PLUGIN_MD5 }}" }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment