You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2022/08/04 22:11:28 UTC
[solr-docker] branch main updated: SOLR-16323: Change USER to use ID instead of Name (#9)
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-docker.git
The following commit(s) were added to refs/heads/main by this push:
new f73bf92 SOLR-16323: Change USER to use ID instead of Name (#9)
f73bf92 is described below
commit f73bf92816948c4a3f209312e5810be7c7ddf427
Author: Houston Putman <ho...@apache.org>
AuthorDate: Thu Aug 4 18:11:23 2022 -0400
SOLR-16323: Change USER to use ID instead of Name (#9)
Also remove vestiges of old-solr-versions
---
.github/workflows/pr-for-official-repo.yml | 3 +--
8.11-slim/Dockerfile | 2 +-
8.11/Dockerfile | 2 +-
old-solr-versions | 14 --------------
4 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/pr-for-official-repo.yml b/.github/workflows/pr-for-official-repo.yml
index 5770cb7..f78deba 100644
--- a/.github/workflows/pr-for-official-repo.yml
+++ b/.github/workflows/pr-for-official-repo.yml
@@ -5,9 +5,8 @@ on:
branches:
- 'main'
paths:
- - 'old-solr-versions'
- 'generate-stackbrew-library.sh'
- - '[0-9]+.[0-9]+/**'
+ - '[0-9]+.[0-9]+(-slim)?/**'
jobs:
test:
diff --git a/8.11-slim/Dockerfile b/8.11-slim/Dockerfile
index 76f913d..2e22845 100644
--- a/8.11-slim/Dockerfile
+++ b/8.11-slim/Dockerfile
@@ -118,7 +118,7 @@ COPY --chown=0:0 scripts /opt/docker-solr/scripts
VOLUME /var/solr
EXPOSE 8983
WORKDIR /opt/solr
-USER $SOLR_USER
+USER $SOLR_UID
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["solr-foreground"]
diff --git a/8.11/Dockerfile b/8.11/Dockerfile
index a9e1a3e..a2e328c 100644
--- a/8.11/Dockerfile
+++ b/8.11/Dockerfile
@@ -118,7 +118,7 @@ COPY --chown=0:0 scripts /opt/docker-solr/scripts
VOLUME /var/solr
EXPOSE 8983
WORKDIR /opt/solr
-USER $SOLR_USER
+USER $SOLR_UID
ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["solr-foreground"]
diff --git a/old-solr-versions b/old-solr-versions
deleted file mode 100644
index a03de3b..0000000
--- a/old-solr-versions
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Tags: 8.11.2, 8.11, 8
-Architectures: amd64, arm64v8
-GitRepo: https://github.com/docker-solr/docker-solr.git
-GitFetch: refs/heads/master
-GitCommit: 970bb718583d14f6f1300f6fd261f01ddcf757c8
-Directory: 8.11
-
-Tags: 8.11.2-slim, 8.11-slim, 8-slim
-Architectures: amd64, arm64v8
-GitRepo: https://github.com/docker-solr/docker-solr.git
-GitFetch: refs/heads/master
-GitCommit: 970bb718583d14f6f1300f6fd261f01ddcf757c8
-Directory: 8.11/slim