Skip to content

Commit

Permalink
Bump to version 20.6.0-12005
Browse files Browse the repository at this point in the history
  • Loading branch information
gocd-ci-user committed Jul 29, 2020
1 parent 6265a94 commit e78fca7
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
28 changes: 14 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@ ARG UID=1000
RUN \
apk --no-cache upgrade && \
apk add --no-cache curl && \
curl --fail --location --silent --show-error "https://download.gocd.org/binaries/20.5.0-11820/generic/go-server-20.5.0-11820.zip" > /tmp/go-server-20.5.0-11820.zip
RUN unzip /tmp/go-server-20.5.0-11820.zip -d /
curl --fail --location --silent --show-error "https://download.gocd.org/binaries/20.6.0-12005/generic/go-server-20.6.0-12005.zip" > /tmp/go-server-20.6.0-12005.zip
RUN unzip /tmp/go-server-20.6.0-12005.zip -d /
RUN mkdir -p /go-server/wrapper /go-server/bin && \
mv /go-server-20.5.0/LICENSE /go-server/LICENSE && \
mv /go-server-20.5.0/bin/go-server /go-server/bin/go-server && \
mv /go-server-20.5.0/lib /go-server/lib && \
mv /go-server-20.5.0/logs /go-server/logs && \
mv /go-server-20.5.0/run /go-server/run && \
mv /go-server-20.5.0/wrapper-config /go-server/wrapper-config && \
mv /go-server-20.5.0/wrapper/wrapper-linux* /go-server/wrapper/ && \
mv /go-server-20.5.0/wrapper/libwrapper-linux* /go-server/wrapper/ && \
mv /go-server-20.5.0/wrapper/wrapper.jar /go-server/wrapper/ && \
mv /go-server-20.6.0/LICENSE /go-server/LICENSE && \
mv /go-server-20.6.0/bin/go-server /go-server/bin/go-server && \
mv /go-server-20.6.0/lib /go-server/lib && \
mv /go-server-20.6.0/logs /go-server/logs && \
mv /go-server-20.6.0/run /go-server/run && \
mv /go-server-20.6.0/wrapper-config /go-server/wrapper-config && \
mv /go-server-20.6.0/wrapper/wrapper-linux* /go-server/wrapper/ && \
mv /go-server-20.6.0/wrapper/libwrapper-linux* /go-server/wrapper/ && \
mv /go-server-20.6.0/wrapper/wrapper.jar /go-server/wrapper/ && \
chown -R ${UID}:0 /go-server && chmod -R g=u /go-server

FROM alpine:3.11

LABEL gocd.version="20.5.0" \
LABEL gocd.version="20.6.0" \
description="GoCD server based on alpine version 3.11" \
maintainer="ThoughtWorks, Inc. <[email protected]>" \
url="https://www.gocd.org" \
gocd.full.version="20.5.0-11820" \
gocd.git.sha="1c9b12ac8aa216a2c062fbec4cba18d9cfb8b404"
gocd.full.version="20.6.0-12005" \
gocd.git.sha="12860aac6351e2a353728c7d7913f34d741c63e0"

# the ports that go server runs on
EXPOSE 8153
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:v20.5.0
docker run -d -p8153:8153 gocd/gocd-server:v20.6.0
```

This will expose container ports 8153(http) onto your server.
Expand All @@ -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:v20.5.0
docker run -v /path/to/godata:/godata -v /path/to/home-dir:/home/go gocd/gocd-server:v20.6.0
```

> **Note:** Ensure that `/path/to/home-dir` and `/path/to/godata` is accessible by the `go` user in container (`go` user - uid `1000`).
Expand All @@ -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:v20.5.0
gocd/gocd-server:v20.6.0
```

To install multiple plugins, add several `-e` arguments as such:
Expand All @@ -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:v20.5.0
gocd/gocd-server:v20.6.0
```

### Installing plugins using a custom entry-point script (see below)
Expand All @@ -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:v20.5.0
gocd/gocd-server:v20.6.0
```
*Checkouted content would overwrite files in `/godata/config/`*.

Expand All @@ -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:v20.5.0
docker run -v /path/to/your/script.sh:/docker-entrypoint.d/your-script.sh ... gocd/gocd-server:v20.6.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:v20.5.0
docker run -v /path/to/script-dir:/docker-entrypoint.d ... gocd/gocd-server:v20.6.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.
Expand All @@ -112,7 +112,7 @@ chown -R 1000 /path/to/godata/addons
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:v20.5.0
docker run -e GOCD_SERVER_JVM_OPTS="-Xmx4096mb -Dfoo=bar" gocd/gocd-server:v20.6.0
```

# Under the hood
Expand All @@ -135,7 +135,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:v20.5.0
docker run --name server -it -p8153:8153 gocd/gocd-server:v20.6.0
```

Then, the below commands will determine to GoCD server IP, server port and ssl port
Expand Down

0 comments on commit e78fca7

Please sign in to comment.