Skip to content

Commit

Permalink
add es image to docker hub and separate dockerfiles in docker dir
Browse files Browse the repository at this point in the history
  • Loading branch information
citizenrich committed Jun 24, 2020
1 parent db951fb commit c37143d
Show file tree
Hide file tree
Showing 8 changed files with 363 additions and 19 deletions.
4 changes: 1 addition & 3 deletions docker-compose.cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@ services:
# - opencr

es:
build:
dockerfile: Dockerfile-es
context: ./
container_name: es
image: intrahealth/elasticsearch:latest
environment:
- node.name=es01
- discovery.type=single-node
Expand Down
4 changes: 1 addition & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ services:
- opencr

es:
build:
dockerfile: Dockerfile-es
context: ./
container_name: es
image: intrahealth/elasticsearch:latest
environment:
- node.name=es01
- discovery.type=single-node
Expand Down
File renamed without changes.
8 changes: 8 additions & 0 deletions docker/elasticsearch/dockerhub.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
set -ex

# automate tagging with the short commit hash
docker build --no-cache -t intrahealth/elasticsearch:$(git rev-parse --short HEAD) .
docker tag intrahealth/elasticsearch:$(git rev-parse --short HEAD) intrahealth/elasticsearch
docker push intrahealth/elasticsearch:$(git rev-parse --short HEAD)
docker push intrahealth/elasticsearch:latest
2 changes: 1 addition & 1 deletion Dockerfile → docker/opencr/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node:erbium-slim

RUN mkdir -p /var/log
COPY . /src/
COPY ../ /src/
WORKDIR /src/server
RUN npm install

Expand Down
File renamed without changes.
17 changes: 13 additions & 4 deletions docs/notebooks/basic_query_in_python.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,20 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 3,
"metadata": {
"scrolled": true
},
"outputs": [],
"outputs": [
{
"name": "stderr",
"output_type": "stream",
"text": [
"/usr/local/lib/python3.7/site-packages/urllib3/connection.py:394: SubjectAltNameWarning: Certificate for localhost has no `subjectAltName`, falling back to check for a `commonName` for now. This feature is being removed by major browsers and deprecated by RFC 2818. (See https://github.com/urllib3/urllib3/issues/497 for details.)\n",
" SubjectAltNameWarning,\n"
]
}
],
"source": [
"server = 'https://localhost:3000/Patient'\n",
"headers = {'Content-Type': 'application/json'}\n",
Expand All @@ -58,14 +67,14 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": 4,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Patient/07d346c7-b787-4a57-a280-7ad4d0cc2086\n"
"Patient/d240c89e-b34f-4394-95a6-05fe11654998\n"
]
}
],
Expand Down
Loading

0 comments on commit c37143d

Please sign in to comment.