Bump to version 23.4.0-17731

Dockerfile

@@ -21,30 +21,30 @@ FROM curlimages/curl:latest as gocd-server-unzip
 USER root
 ARG TARGETARCH
 ARG UID=1000
-RUN curl --fail --location --silent --show-error "https://download.gocd.org/binaries/23.3.0-16991/generic/go-server-23.3.0-16991.zip" > /tmp/go-server-23.3.0-16991.zip && \
- unzip -q /tmp/go-server-23.3.0-16991.zip -d / && \
+RUN curl --fail --location --silent --show-error "https://download.gocd.org/binaries/23.4.0-17731/generic/go-server-23.4.0-17731.zip" > /tmp/go-server-23.4.0-17731.zip && \
+ unzip -q /tmp/go-server-23.4.0-17731.zip -d / && \
  mkdir -p /go-server/wrapper /go-server/bin && \
- mv -v /go-server-23.3.0/LICENSE /go-server/LICENSE && \
- mv -v /go-server-23.3.0/bin/go-server /go-server/bin/go-server && \
- mv -v /go-server-23.3.0/lib /go-server/lib && \
- mv -v /go-server-23.3.0/logs /go-server/logs && \
- mv -v /go-server-23.3.0/run /go-server/run && \
- mv -v /go-server-23.3.0/wrapper-config /go-server/wrapper-config && \
+ mv -v /go-server-23.4.0/LICENSE /go-server/LICENSE && \
+ mv -v /go-server-23.4.0/bin/go-server /go-server/bin/go-server && \
+ mv -v /go-server-23.4.0/lib /go-server/lib && \
+ mv -v /go-server-23.4.0/logs /go-server/logs && \
+ mv -v /go-server-23.4.0/run /go-server/run && \
+ mv -v /go-server-23.4.0/wrapper-config /go-server/wrapper-config && \
  WRAPPERARCH=$(if [ $TARGETARCH == amd64 ]; then echo x86-64; elif [ $TARGETARCH == arm64 ]; then echo arm-64; else echo $TARGETARCH is unknown!; exit 1; fi) && \
- mv -v /go-server-23.3.0/wrapper/wrapper-linux-$WRAPPERARCH* /go-server/wrapper/ && \
- mv -v /go-server-23.3.0/wrapper/libwrapper-linux-$WRAPPERARCH* /go-server/wrapper/ && \
- mv -v /go-server-23.3.0/wrapper/wrapper.jar /go-server/wrapper/ && \
+ mv -v /go-server-23.4.0/wrapper/wrapper-linux-$WRAPPERARCH* /go-server/wrapper/ && \
+ mv -v /go-server-23.4.0/wrapper/libwrapper-linux-$WRAPPERARCH* /go-server/wrapper/ && \
+ mv -v /go-server-23.4.0/wrapper/wrapper.jar /go-server/wrapper/ && \
  chown -R ${UID}:0 /go-server && chmod -R g=u /go-server
 
 FROM docker.io/alpine:3.18
 ARG TARGETARCH
 
-LABEL gocd.version="23.3.0" \
+LABEL gocd.version="23.4.0" \
  description="GoCD server based on docker.io/alpine:3.18" \
  maintainer="GoCD Team <[email protected]>" \
  url="https://www.gocd.org" \
- gocd.full.version="23.3.0-16991" \
- gocd.git.sha="f38981e8aa684d63ac96f517996cd888eff37640"
+ gocd.full.version="23.4.0-17731" \
+ gocd.git.sha="4deb96d823b921419680560be080588e900d406e"
 
 # the ports that GoCD server runs on
 EXPOSE 8153
@@ -64,13 +64,13 @@ RUN \
  apk --no-cache upgrade && \
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
  adduser -D -u ${UID} -s /bin/bash -G root go && \
- apk add --no-cache nss git mercurial subversion openssh-client bash curl procps && \
+ apk add --no-cache git openssh-client bash curl procps && \
  # install glibc/zlib for the Tanuki Wrapper, and use by glibc-linked Adoptium JREs && \
  apk add --no-cache tzdata --virtual .build-deps curl binutils zstd && \
  GLIBC_VER="2.34-r0" && \
  ALPINE_GLIBC_REPO="https://github.com/sgerrand/alpine-pkg-glibc/releases/download" && \
- ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.2.13-2-x86_64.pkg.tar.zst" && \
- ZLIB_SHA256=c4f394724b20b84d7304b23bbb58442b6ef53e5cbac89eb51e39d7f0a46abafd && \
+ ZLIB_URL="https://archive.archlinux.org/packages/z/zlib/zlib-1%3A1.3-2-x86_64.pkg.tar.zst" && \
+ ZLIB_SHA256=805ad81ea00486717df264b05567a4a0b812a484a7482110b6159fbea6dc7e63 && \
  curl -LfsS https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub && \
  SGERRAND_RSA_SHA256="823b54589c93b02497f1ba4dc622eaef9c813e6b0f0ebbb2f771e32adf9f4ef2" && \
  echo "${SGERRAND_RSA_SHA256} */etc/apk/keys/sgerrand.rsa.pub" | sha256sum -c - && \
@@ -91,7 +91,7 @@ RUN \
  apk del --purge .build-deps glibc-i18n && \
  rm -rf /tmp/*.apk /tmp/libz /tmp/libz.tar* /var/cache/apk/* && \
  # end installing glibc/zlib && \
- curl --fail --location --silent --show-error "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.8%2B7/OpenJDK17U-jre_$(uname -m | sed -e s/86_//g)_linux_hotspot_17.0.8_7.tar.gz" --output /tmp/jre.tar.gz && \
+ curl --fail --location --silent --show-error "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9/OpenJDK17U-jre_$(uname -m | sed -e s/86_//g)_linux_hotspot_17.0.9_9.tar.gz" --output /tmp/jre.tar.gz && \
  mkdir -p /gocd-jre && \
  tar -xf /tmp/jre.tar.gz -C /gocd-jre --strip 1 && \
  rm -rf /tmp/jre.tar.gz && \

README.md

@@ -11,7 +11,7 @@ Please make sure to log them at https://github.com/gocd/gocd.
 Start the container with this:
 
 ```shell
-docker run -d -p8153:8153 gocd/gocd-server:v23.3.0
+docker run -d -p8153:8153 gocd/gocd-server:v23.4.0
 ```
 
 This will expose container ports 8153(http) onto your server.
@@ -26,7 +26,7 @@ artifacts, plugins, and logs into `/godata`. If you'd like to provide secure
 credentials like SSH private keys among other things, you can mount `/home/go`
 
 ```shell
-docker run -v /path/to/godata:/godata -v /path/to/home-dir:/home/go gocd/gocd-server:v23.3.0
+docker run -v /path/to/godata:/godata -v /path/to/home-dir:/home/go gocd/gocd-server:v23.4.0
 ```
 
 > **Note:** Ensure that `/path/to/home-dir` and `/path/to/godata` is accessible by the `go` user in container (`go` user - uid `1000`).
@@ -45,7 +45,7 @@ An example example would be `GOCD_PLUGIN_INSTALL_docker-elastic-agents=https://g
 ```shell
 docker run \
  -e GOCD_PLUGIN_INSTALL_docker-elastic-agents=https://github.com/gocd-contrib/docker-elastic-agents/releases/download/v0.8.0/docker-elastic-agents-0.8.0.jar \
- gocd/gocd-server:v23.3.0
+ gocd/gocd-server:v23.4.0
 ```
 
 To install multiple plugins, add several `-e` arguments as such:
@@ -54,7 +54,7 @@ To install multiple plugins, add several `-e` arguments as such:
 docker run \
  -e GOCD_PLUGIN_INSTALL_a-plugin=https://example.com/a-plugin.jar \
  -e GOCD_PLUGIN_INSTALL_b-plugin=https://example.com/b-plugin.jar \
- gocd/gocd-server:v23.3.0
+ gocd/gocd-server:v23.4.0
 ```
 
 ### Installing plugins using a custom entry-point script (see below)
@@ -76,7 +76,7 @@ Cloned repo **must** contain all files from `/godata/config` dir.
 docker run \
  -e CONFIG_GIT_REPO=https://gocd_user:<password_or_auth_token>/config.git \
  -e CONFIG_GIT_BRANCH=branch_with_config \
- gocd/gocd-server:v23.3.0
+ gocd/gocd-server:v23.4.0
 ```
 *Checkouted content would overwrite files in `/godata/config/`*.
 
@@ -86,13 +86,13 @@ docker run \
 To execute custom script(s) during the container boostrap, but **before** the GoCD server starts just add `-v /path/to/your/script.sh:/docker-entrypoint.d/your-script.sh` like so:
 
 ```shell
-docker run -v /path/to/your/script.sh:/docker-entrypoint.d/your-script.sh ... gocd/gocd-server:v23.3.0
+docker run -v /path/to/your/script.sh:/docker-entrypoint.d/your-script.sh ... gocd/gocd-server:v23.4.0
 ```
 
 If you have several scripts in a directory that you'd like to execute:
 
 ```shell
-docker run -v /path/to/script-dir:/docker-entrypoint.d ... gocd/gocd-server:v23.3.0
+docker run -v /path/to/script-dir:/docker-entrypoint.d ... gocd/gocd-server:v23.4.0
 ```
 
 > **Note:** Ensure that your scripts are executable `chmod a+x` — you can add as many scripts as you like, `bash` is available on the container. If your script uses other scripting language (perl, python), please ensure that the scripting language is installed in the container.
@@ -102,7 +102,7 @@ docker run -v /path/to/script-dir:/docker-entrypoint.d ... gocd/gocd-server:v23.
 JVM options can be tweaked using the environment variable `GOCD_SERVER_JVM_OPTS`.
 
 ```shell
-docker run -e GOCD_SERVER_JVM_OPTS="-Xmx4096mb -Dfoo=bar" gocd/gocd-server:v23.3.0
+docker run -e GOCD_SERVER_JVM_OPTS="-Xmx4096mb -Dfoo=bar" gocd/gocd-server:v23.4.0
 ```
 
 # Under the hood
@@ -124,7 +124,7 @@ Once the GoCD server is up, we should be able to determine its ip address and th
 The IP address and ports of the GoCD server in a docker container are important to know as they will be used by the GoCD agents to connect to it.
 If you have started the container with
 ```shell
-docker run --name server -it -p8153:8153 gocd/gocd-server:v23.3.0
+docker run --name server -it -p8153:8153 gocd/gocd-server:v23.4.0
 ```
 
 Then, the below commands will determine to GoCD server IP, server port and ssl port

logback-include.xml

@@ -15,18 +15,21 @@
  ~ limitations under the License.
  -->
 
-<included>
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>
- ${gocd.server.logback.defaultPattern:-%date{ISO8601} %-5level [%thread] %logger{0}:%line - %msg%n}
- </pattern>
- </encoder>
- </appender>
+<included
+ xmlns="http:https://ch.qos.logback/xml/ns/logback"
+ xmlns:xsi="http:https://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http:https://ch.qos.logback/xml/ns/logback https://raw.githubusercontent.com/enricopulatzo/logback-XSD/master/src/main/xsd/logback.xsd"
+>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>
+ ${gocd.server.logback.defaultPattern:-%date{ISO8601} %-5level [%thread] %logger{0}:%line - %msg%n}
+ </pattern>
+ </encoder>
+ </appender>
 
-
- <root>
- <appender-ref ref="CONSOLE"/>
- </root>
+ <root level="${gocd.server.logback.root.level:-WARN}">
+ <appender-ref ref="CONSOLE"/>
+ </root>
 
 </included>