From 1be17eb005e1d9c660f401653acfc7cbf939d948 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Mon, 18 Sep 2023 22:26:58 -0700 Subject: [PATCH 1/2] rename build target --- .github/workflows/build-test-lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml index 426ea408f..b3569f2ac 100644 --- a/.github/workflows/build-test-lint.yaml +++ b/.github/workflows/build-test-lint.yaml @@ -21,7 +21,7 @@ jobs: secrets: inherit with: platforms: "linux/amd64" # "linux/amd64,linux/arm64" - target: hyku-web + webTarget: hyku-web solr: true solrTarget: worker: true From d6ef04313b3a75b983afe4fed2e9383f799839a3 Mon Sep 17 00:00:00 2001 From: Rob Kaufman Date: Mon, 18 Sep 2023 22:30:13 -0700 Subject: [PATCH 2/2] label solr --- .github/workflows/build-test-lint.yaml | 4 +--- docker-compose.yml | 1 + solr/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml index 54f8fea16..de378d181 100644 --- a/.github/workflows/build-test-lint.yaml +++ b/.github/workflows/build-test-lint.yaml @@ -22,7 +22,5 @@ jobs: with: platforms: "linux/amd64" # "linux/amd64,linux/arm64" webTarget: hyku-web - solr: true - solrTarget: - worker: true + solrTarget: hyku-solr workerTarget: hyku-worker diff --git a/docker-compose.yml b/docker-compose.yml index 9501c9c8c..0d349e7e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -58,6 +58,7 @@ services: build: context: solr dockerfile: Dockerfile + target: hyku-solr environment: - OOM=script - SOLR_ADMIN_USER=solr diff --git a/solr/Dockerfile b/solr/Dockerfile index e89995951..8b0cd3ae1 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -1,6 +1,6 @@ -FROM solr:8.3 +FROM solr:8.3 as hyku-solr ENV SOLR_USER="solr" \ SOLR_GROUP="solr" USER root COPY --chown=solr:solr security.json /var/solr/data/security.json -USER $SOLR_USER \ No newline at end of file +USER $SOLR_USER