Merge pull request #48 from atlas-bi/2022.01.1-patch-1

2022.01.1 patch 1

Author: christopherpickering

.github/workflows/demo.yml

@@ -6,17 +6,31 @@ on:
 
   workflow_dispatch:
 
+  push:
+    branches:
+      - master
 jobs:
   heroku-deploy:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
-      - name: Deploy to Heroku
+
+      - name: Deploy demo search
+        uses: gonuit/[email protected]
+        with:
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_APP_NAME_SEARCH }}
+          email: ${{ secrets.HEROKU_EMAIL }}
+          dockerfile_name: solr.Dockerfile
+          docker_options: --no-cache --build-arg HOST=${{ secrets.SQL_HOST }} --build-arg PASSWORD=${{ secrets.SQL_PASS }} --build-arg USER=${{ secrets.SQL_USER }}
+
+      - name: Deploy demo app
         uses: gonuit/[email protected]
         with:
           heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
           heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
           email: ${{ secrets.HEROKU_EMAIL }}
           dockerfile_name: Dockerfile
-          docker_options: --no-cache --build-arg HOST="${{SQL_HOST}}" --build-arg PASSWORD="${{SQL_PASS}}" --build-arg USER=${{SQL_USER}}
+          docker_options: --no-cache --build-arg HOST=${{ secrets.SQL_HOST }} --build-arg PASSWORD=${{ secrets.SQL_PASS }} --build-arg USER=${{ secrets.SQL_USER }}
+

Dockerfile

@@ -20,46 +20,15 @@ COPY ["./web/.", "./web/"]
 WORKDIR "/app/web/"
 RUN dotnet publish -c Release -o out
 
-FROM python:3.10-alpine as search
-WORKDIR /app
-ARG USER
-ARG PASSWORD
-ARG HOST
-# copy site
-COPY --from=build ["/app/web/out", "./"]
-
-# startup search and load data
-RUN apk add --no-cache openjdk11 bash lsof python3-dev curl gcc git py3-pip gcc libc-dev g++ libffi-dev libxml2 unixodbc-dev && \
-    pip3 install pyodbc pysolr pytz
-
-# install sql server driver
-RUN curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.8.1.1-1_amd64.apk && \
-    apk add --allow-untrusted msodbcsql17_17.8.1.1-1_amd64.apk
-
-# pull solr etl
-RUN mkdir etl && cd etl && git clone --depth 1 https://github.com/atlas-bi/Solr-Search-ETL.git .
-
-# create settings
-RUN cd etl && echo "SOLR_URL = \"http://localhost:8983/solr/atlas\"" > settings.py && \
-    echo "SOLR_LOOKUP_URL = \"http://localhost:8983/solr/atlas_lookups\"" >> settings.py && \
-    echo "SQL_CONN = \"SERVER=$HOST;DATABASE=atlas;UID=$USER;PWD=$PASSWORD\"" >> settings.py
-
-# load search
-RUN solr/bin/solr start -force -noprompt -v && sleep 20 && cd etl && python3 atlas_collections.py && python3 atlas_groups.py && python3 atlas_initiatives.py && \
-    python3 atlas_lookups.py && python3 atlas_reports.py && python3 atlas_terms.py && \
-    python3 atlas_users.py
-
 FROM mcr.microsoft.com/dotnet/sdk:5.0-alpine
 WORKDIR /app
-RUN apk add --no-cache openjdk11 bash lsof
-COPY --from=search ["/app", "./"]
+COPY --from=build ["/app/web/out", "./"]
 
 ARG USER
 ARG PASSWORD
 ARG HOST
 
 # create config
-RUN echo "{\"solr\": {\"atlas_address\": \"http://localhost:8983/solr/atlas\"},\"ConnectionStrings\": {\"AtlasDatabase\": \"Server=$HOST;Database=atlas;User Id=$USER; Password=$PASSWORD; MultipleActiveResultSets=true\"}}" > appsettings.cust.json
-
+RUN echo "{\"solr\": {\"atlas_address\": \"https://atlas-dotnet-search.herokuapp.com/solr/atlas\"},\"ConnectionStrings\": {\"AtlasDatabase\": \"Server=$HOST;Database=atlas;User Id=$USER; Password=$PASSWORD; MultipleActiveResultSets=true\"}}" > appsettings.cust.json
 # in release 2022.02.2 we need to change the name from atlas_dotnet to atlas_web
-CMD solr/bin/solr start -force -noprompt && ASPNETCORE_URLS=http://*:$PORT dotnet "Atlas_Dotnet.dll"
+CMD ASPNETCORE_URLS=http://*:$PORT dotnet "Atlas_Dotnet.dll"

solr.Dockerfile

@@ -0,0 +1,55 @@
+# to build
+# docker build  --build-arg HOST=host PASSWORD=password USER=user --tag atlas_demo_search -f solr.Dockerfile .
+
+# to run locally
+# docker run -i -t -p 8983:8983 -e PORT=8983 -u 0 atlas_demo_search:latest
+
+# to get in shell
+# docker run --entrypoint sh -i -t -u 0 atlas_demo_search:latest
+
+# to access webapp
+# http://localhost:8983
+
+FROM python:3.10-alpine as search
+WORKDIR /app
+ARG USER
+ARG PASSWORD
+ARG HOST
+# copy site
+COPY ["./web/solr", "./"]
+
+# startup search and load data
+RUN apk add --no-cache openjdk11 bash lsof python3-dev curl gcc git py3-pip gcc libc-dev g++ libffi-dev libxml2 unixodbc-dev && \
+    pip3 install pyodbc pysolr pytz
+
+# install sql server driver
+RUN curl -O https://download.microsoft.com/download/e/4/e/e4e67866-dffd-428c-aac7-8d28ddafb39b/msodbcsql17_17.8.1.1-1_amd64.apk && \
+    apk add --allow-untrusted msodbcsql17_17.8.1.1-1_amd64.apk
+
+# pull solr etl
+RUN mkdir etl && cd etl && git clone --depth 1 https://github.com/atlas-bi/Solr-Search-ETL.git .
+
+# create settings
+RUN cd etl && echo "SOLR_URL = \"http://localhost:8983/solr/atlas\"" > settings.py && \
+    echo "SOLR_LOOKUP_URL = \"http://localhost:8983/solr/atlas_lookups\"" >> settings.py && \
+    echo "SQL_CONN = \"SERVER=$HOST;DATABASE=atlas;UID=$USER;PWD=$PASSWORD\"" >> settings.py
+
+# load search
+RUN chmod -R 777 bin && bin/solr start -force -noprompt -v && sleep 20 && cd etl && python3 atlas_collections.py && python3 atlas_groups.py && python3 atlas_initiatives.py && \
+    python3 atlas_lookups.py && python3 atlas_reports.py && python3 atlas_terms.py && \
+    python3 atlas_users.py
+
+FROM alpine:latest
+WORKDIR /app
+RUN apk add --no-cache openjdk11 bash lsof
+COPY --from=search ["/app", "./"]
+
+ARG USER
+ARG PASSWORD
+ARG HOST
+
+# create config
+
+RUN chmod -R 777 bin
+# in release 2022.02.2 we need to change the name from atlas_dotnet to atlas_web
+CMD bin/solr start -force -noprompt -f -p $PORT