Update URLs to point to the Openaleph GHCR && update GHA

.github/workflows/build.yml

@@ -1,9 +1,7 @@
-name: package
+name: Build elasticsearch-openaleph
 
-on: 
+on:
   push: {}
-  schedule:
-    - cron: "0 3 * * *"
 
 permissions:
   packages: write
@@ -12,23 +10,40 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/openaleph/aleph-elasticsearch
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=sha
+            type=raw,value=latest
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           install: true
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
+          username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v2
+
+      - name: Build and push release
+        uses: docker/build-push-action@v3
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ghcr.io/alephdata/aleph-elasticsearch:${{ github.sha }}
+          push: ${{ github.event_name == 'push' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

Dockerfile

@@ -1,5 +1,5 @@
 FROM elasticsearch:7.16.1
-LABEL org.opencontainers.image.source = "https://github.com/alephdata/aleph-elasticsearch"
+LABEL org.opencontainers.image.source = "https://github.com/openaleph/aleph-elasticsearch"
 
 RUN bin/elasticsearch-plugin install --batch repository-s3 \
     && bin/elasticsearch-plugin install --batch repository-gcs \
@@ -8,4 +8,4 @@ RUN bin/elasticsearch-plugin install --batch repository-s3 \
 COPY k8s-entrypoint.sh /k8s-entrypoint.sh
 COPY --chown=elasticsearch synonames.txt /usr/share/elasticsearch/config/
 
-ENTRYPOINT [ "/k8s-entrypoint.sh" ]
+ENTRYPOINT [ "/k8s-entrypoint.sh" ]

Makefile

@@ -3,13 +3,13 @@ TAG=latest
 all: push
 
 build:
-	docker build -t alephdata/aleph-elasticsearch:$(TAG) .
+	docker build -t openaleph/aleph-elasticsearch:$(TAG) .
 
 run: build
-	docker run -ti alephdata/aleph-elasticsearch:$(TAG) bash
+	docker run -ti openaleph/aleph-elasticsearch:$(TAG) bash
 
 exec: build
-	docker run -ti -v $(PWD)/secrets:/secrets alephdata/aleph-elasticsearch:$(TAG)
+	docker run -ti -v $(PWD)/secrets:/secrets openaleph/aleph-elasticsearch:$(TAG)
 
 push: build
-	docker push alephdata/aleph-elasticsearch:$(TAG)
+	docker push openaleph/aleph-elasticsearch:$(TAG)

README.md

@@ -1,9 +1,8 @@
 # aleph-elasticsearch
 
-This is a vendored version of ElasticSearch, suitable for use with the main Aleph application.
-The principal additions are plugins for ICU, repository support for AWS and GCP, and the 
+This is a vendored version of ElasticSearch, suitable for use with the main OpenAleph application.
+The principal additions are plugins for ICU, repository support for AWS and GCP, and the
 synonym file used to expand queries for names in Aleph. That file is based on the adjacent
 `synonames` project:
 
-* https://github.com/alephdata/synonames
-
+- https://github.com/alephdata/synonames