whoo volume works

woogiee · Jan 21, 2018 · 8297e14 · 8297e14
1 parent b28d5bd
commit 8297e14
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 solr/certs/
 data/solrhome/
 !data/solrhome/configsets
-!data/solrhome/solr.xml
+!data/solrhome/solr.xml
+!data/solrhome/zoo.cfg
+!data/solrhome/README.txt
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,16 +3,16 @@ version: '2.3'
 services:
 
   solr-server:
-    image: solr
+    image: solr-win
     build:
       context: .\solr
     hostname: solr
     ports:
       - "8983:8983"
     environment:
-      SOLR_HOME: c:/solrhome
+      SOLR_HOME: g:/solrhome
     volumes:
-      - ./data/solrhome:c:/solrhome
+      - ./data:c:/data
 
 networks:
   default:

diff --git a/solr/Dockerfile b/solr/Dockerfile
@@ -1,5 +1,5 @@
 # escape=\
-FROM openjdk:9.0.1-jdk-windowsservercore-1709
+FROM openjdk:8u151-jdk-windowsservercore-1709
 
 SHELL ["powershell", "-NoProfile", "-Command", "$ErrorActionPreference = 'Stop';"]
 
@@ -15,6 +15,10 @@ RUN Invoke-WebRequest -Method Get -Uri ('http://archive.apache.org/dist/lucene/s
     Expand-Archive -Path /solr.zip -DestinationPath /solr; \
     Remove-Item /solr.zip -Force;
 
+VOLUME c:/data
+
+RUN Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices' -Name 'G:' -Value '\??\C:\data' -Type String
+
 WORKDIR ${SERVER_ROOT}
 
 ADD ./certs ./server/etc

diff --git a/solr/Generate-Certificate.ps1 b/solr/Generate-Certificate.ps1
@@ -1,5 +1,5 @@
 # generate
-$cert = New-SelfSignedCertificate -FriendlyName "solr" -DnsName "solr" -CertStoreLocation 'cert:\LocalMachine' -NotAfter (Get-Date).AddYears(1)
+$cert = New-SelfSignedCertificate -FriendlyName "solr" -DnsName "solr" -CertStoreLocation 'cert:\LocalMachine' -NotAfter (Get-Date).AddYears(5)
 
 # trust
 $store = New-Object System.Security.Cryptography.X509Certificates.X509Store "Root", "LocalMachine"