Skip to content

Commit

Permalink
Merge pull request #177 from mlibrary/workflows
Browse files Browse the repository at this point in the history
solr images
  • Loading branch information
gkostin1966 authored Mar 17, 2023
2 parents e565dca + 7d71304 commit 6192cd4
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-solr-amd64-image.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "Build solr image"
name: "Build solr amd64 image"

on:
workflow_dispatch: # This allows to kick-off the action manually from GitHub Actions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-solr-arm64-image.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "Build solr image"
name: "Build solr arm64 image"

on:
workflow_dispatch: # This allows to kick-off the action manually from GitHub Actions
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/build-solr-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: "Build solr image"

on:
workflow_dispatch: # This allows to kick-off the action manually from GitHub Actions

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build image and push to GitHub Container Registry
uses: docker/build-push-action@v2
with:
file: ./solr/Dockerfile
context: ./solr
push: true
tags: 'ghcr.io/mlibrary/dromedary/dromedary-solr:${{ github.ref_name }}, ghcr.io/mlibrary/dromedary/dromedary-solr:latest'
5 changes: 5 additions & 0 deletions solr/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ignore everything
*

# Except
!/lib
3 changes: 3 additions & 0 deletions solr/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM solr:8-slim

COPY ./lib/*.jar /var/solr/um_plugins/
5 changes: 0 additions & 5 deletions solr/solr-amd64.dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
ARG arch=amd64
FROM --platform=linux/${arch} solr:8-slim

#COPY ./solr/med/conf /solr_config
COPY ./lib/*.jar /var/solr/um_plugins/
#RUN ls /var/solr/um_plugins/

#ENTRYPOINT ["docker-entrypoint.sh", "solr-precreate", "dromedary-testing", "/solr_config"]

5 changes: 0 additions & 5 deletions solr/solr-arm64.dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
ARG arch=arm64
FROM --platform=linux/${arch} solr:8-slim

#COPY ./solr/med/conf /solr_config
COPY ./lib/*.jar /var/solr/um_plugins/
#RUN ls /var/solr/um_plugins/

#ENTRYPOINT ["docker-entrypoint.sh", "solr-precreate", "dromedary-testing", "/solr_config"]

0 comments on commit 6192cd4

Please sign in to comment.