Skip to content
This repository was archived by the owner on Sep 1, 2025. It is now read-only.

Commit 51b88bf

Browse files
catilepticps-occrpstchris
authored
Update URLs to point to the Openaleph GHCR && update GHA (#1)
* Update elasticsearch to 7.16.3 * Allow manual workflow dispatch * Update GHA and ULRs to point to OpenAleph * Make GHA run on push --------- Co-authored-by: Pujan Shah <pujan.shah@occrp.org> Co-authored-by: Christian Stefanescu <217554+stchris@users.noreply.github.com> Co-authored-by: Christian Stefanescu <christian.stefanescu@occrp.org>
1 parent 3bb5dbe commit 51b88bf

File tree

4 files changed

+39
-25
lines changed

4 files changed

+39
-25
lines changed

.github/workflows/build.yml

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
name: package
1+
name: Build elasticsearch-openaleph
22

3-
on:
3+
on:
44
push: {}
5-
schedule:
6-
- cron: "0 3 * * *"
75

86
permissions:
97
packages: write
@@ -12,23 +10,40 @@ jobs:
1210
docker:
1311
runs-on: ubuntu-latest
1412
steps:
15-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
14+
1615
- name: Set up QEMU
17-
uses: docker/setup-qemu-action@v1
16+
uses: docker/setup-qemu-action@v2
17+
18+
- name: Docker meta
19+
id: meta
20+
uses: docker/metadata-action@v4
21+
with:
22+
images: ghcr.io/openaleph/aleph-elasticsearch
23+
tags: |
24+
type=ref,event=branch
25+
type=semver,pattern={{version}}
26+
type=sha
27+
type=raw,value=latest
28+
1829
- name: Set up Docker Buildx
19-
uses: docker/setup-buildx-action@v1
30+
uses: docker/setup-buildx-action@v2
2031
with:
2132
install: true
22-
- name: Login to DockerHub
23-
uses: docker/login-action@v1
33+
34+
- name: Login to GitHub Container Registry
35+
uses: docker/login-action@v2
2436
with:
2537
registry: ghcr.io
26-
username: ${{ github.repository_owner }}
38+
username: ${{ github.actor }}
2739
password: ${{ secrets.GITHUB_TOKEN }}
28-
- name: Build and push
29-
uses: docker/build-push-action@v2
40+
41+
- name: Build and push release
42+
uses: docker/build-push-action@v3
3043
with:
3144
context: .
32-
platforms: linux/amd64,linux/arm64
33-
push: true
34-
tags: ghcr.io/alephdata/aleph-elasticsearch:${{ github.sha }}
45+
push: ${{ github.event_name == 'push' }}
46+
tags: ${{ steps.meta.outputs.tags }}
47+
labels: ${{ steps.meta.outputs.labels }}
48+
cache-from: type=gha
49+
cache-to: type=gha,mode=max

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM elasticsearch:7.16.1
2-
LABEL org.opencontainers.image.source = "https://github.com/alephdata/aleph-elasticsearch"
2+
LABEL org.opencontainers.image.source = "https://github.com/openaleph/aleph-elasticsearch"
33

44
RUN bin/elasticsearch-plugin install --batch repository-s3 \
55
&& bin/elasticsearch-plugin install --batch repository-gcs \
@@ -8,4 +8,4 @@ RUN bin/elasticsearch-plugin install --batch repository-s3 \
88
COPY k8s-entrypoint.sh /k8s-entrypoint.sh
99
COPY --chown=elasticsearch synonames.txt /usr/share/elasticsearch/config/
1010

11-
ENTRYPOINT [ "/k8s-entrypoint.sh" ]
11+
ENTRYPOINT [ "/k8s-entrypoint.sh" ]

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ TAG=latest
33
all: push
44

55
build:
6-
docker build -t alephdata/aleph-elasticsearch:$(TAG) .
6+
docker build -t openaleph/aleph-elasticsearch:$(TAG) .
77

88
run: build
9-
docker run -ti alephdata/aleph-elasticsearch:$(TAG) bash
9+
docker run -ti openaleph/aleph-elasticsearch:$(TAG) bash
1010

1111
exec: build
12-
docker run -ti -v $(PWD)/secrets:/secrets alephdata/aleph-elasticsearch:$(TAG)
12+
docker run -ti -v $(PWD)/secrets:/secrets openaleph/aleph-elasticsearch:$(TAG)
1313

1414
push: build
15-
docker push alephdata/aleph-elasticsearch:$(TAG)
15+
docker push openaleph/aleph-elasticsearch:$(TAG)

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# aleph-elasticsearch
22

3-
This is a vendored version of ElasticSearch, suitable for use with the main Aleph application.
4-
The principal additions are plugins for ICU, repository support for AWS and GCP, and the
3+
This is a vendored version of ElasticSearch, suitable for use with the main OpenAleph application.
4+
The principal additions are plugins for ICU, repository support for AWS and GCP, and the
55
synonym file used to expand queries for names in Aleph. That file is based on the adjacent
66
`synonames` project:
77

8-
* https://github.com/alephdata/synonames
9-
8+
- https://github.com/alephdata/synonames

0 commit comments

Comments
 (0)