diff --git a/Dockerfile b/Dockerfile index cc70539..ef46924 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # When updating, update the README and the alpine_version ARG # * Use current version from https://alpinelinux.org/downloads/ # * ARGs repeat because Dockerfile ARGs are layer specific but will reuse the value defined here. -ARG alpine_version=3.20.0 +ARG alpine_version=3.20.2 # We copy files from the context into a scratch container first to avoid a problem where docker and # docker-compose don't share layer hashes https://github.com/docker/compose/issues/883 normally. @@ -29,7 +29,7 @@ COPY . /code/ # See from a previously published version to avoid pulling from Docker Hub (docker.io) # This version is only used to install the real version -FROM ghcr.io/openzipkin/alpine:3.18.5 as install +FROM ghcr.io/openzipkin/alpine:3.20.0 as install WORKDIR /code # Conditions aren't supported in Dockerfile instructions, so we copy source even if it isn't used. diff --git a/README.md b/README.md index 52b34d0..e6aa79c 100644 --- a/README.md +++ b/README.md @@ -13,22 +13,22 @@ This is an internal base layer primarily used in [docker-java](https://github.co To browse the image, run it in interactive mode with TTY enabled like so: ```bash -docker run -ti --rm ghcr.io/openzipkin/alpine:3.20.0 +docker run -ti --rm ghcr.io/openzipkin/alpine:3.20.2 / # ``` ## Release process Build the `Dockerfile` using the current version from https://alpinelinux.org/downloads/: ```bash -# Note 3.20.0 not 3.19! -./build-bin/build 3.20.0 +# Note 3.20.2 not 3.19! +./build-bin/build 3.20.2 ``` Next, verify the built image matches that version: ```bash docker run --rm openzipkin/alpine:test -c 'cat /etc/alpine-release' -3.20.0 +3.20.2 ``` -To release the image, push a tag matching the arg to `build-bin/build` (ex `3.20.0`). +To release the image, push a tag matching the arg to `build-bin/build` (ex `3.20.2`). This triggers a [GitHub Actions](https://github.com/openzipkin/docker-alpine/actions) job to push the image.