Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alpine 3.20.3 #77

Merged
merged 2 commits into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/base-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
matrix:
image:
- { dir: base, name: lnls-debian-11-epics-7 }
- { dir: base/musl, name: lnls-alpine-3.18-epics-7 }
- { dir: base/musl, name: lnls-alpine-3-epics-7 }
env:
TAG: ${{ github.event_name == 'push' && github.ref_name || github.head_ref }}
REGISTRY: ghcr.io/${{ github.repository_owner }}
Expand Down
7 changes: 7 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## Unreleased

### Breaking changes

* base: only use major version for Alpine image names. by @ericonr in
https://github.com/cnpem/epics-in-docker/pull/77.
* Users of the Alpine image must update their workflows to use
`ghcr.io/cnpem/lnls-alpine-3-epics-7`.

### New features

* base: add bitshuffle support for areaDetector. by @gustavosr8 in
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ some reason. It should also be able to cope better than the Debian-based
default image with older kernels.

It can be obtained directly from the [GitHub
registry](https://github.com/cnpem/epics-in-docker/pkgs/container/lnls-alpine-3.18-epics-7).
registry](https://github.com/cnpem/epics-in-docker/pkgs/container/lnls-alpine-3-epics-7).

### Building fully static IOCs

Expand All @@ -162,7 +162,7 @@ the following contents:
```yaml
services:
build-static-ioc:
image: ghcr.io/cnpem/lnls-alpine-3.18-epics-7:RELEASE
image: ghcr.io/cnpem/lnls-alpine-3-epics-7:RELEASE
volumes:
- type: bind
source: ./
Expand Down
2 changes: 1 addition & 1 deletion base/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DEBIAN_VERSION=11.9
ALPINE_VERSION=3.18.6
ALPINE_VERSION=3.20.3

EPICS7_BASE_VERSION=7.0.7
PVXS_VERSION=1.3.1
Expand Down
1 change: 1 addition & 0 deletions base/musl/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN apk add --no-cache \
readline-static \
ncurses-static \
python3-dev \
py3-setuptools \
py3-numpy-dev

COPY lnls-get-n-unpack.sh /usr/local/bin/lnls-get-n-unpack
Expand Down
2 changes: 1 addition & 1 deletion base/musl/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
epics-base:
image: ${REGISTRY:-ghcr.io/cnpem}/lnls-alpine-3.18-epics-7:$TAG
image: ${REGISTRY:-ghcr.io/cnpem}/lnls-alpine-3-epics-7:$TAG
build:
context: ../
dockerfile: musl/Dockerfile
Expand Down