Merge pull request #20 from Senzing/issue-17.dockter.1

issue-17 Update for RPM installation
senzing-garage · Aug 3, 2019 · 92af60f · 92af60f
2 parents ff8ee6d + d8052b4
commit 92af60f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ ENV REFRESHED_AT=2019-08-05
 
 LABEL Name="senzing/template" \
       Maintainer="[email protected]" \
-      Version="1.3.0"
+      Version="1.0.0"
 
 HEALTHCHECK CMD ["/app/healthcheck.sh"]
 

diff --git a/Makefile b/Makefile
@@ -26,8 +26,8 @@ docker-build: docker-rmi-for-build
 		--tag $(DOCKER_IMAGE_NAME):$(GIT_VERSION) \
 		.
 
-.PHONY: docker-build-base
-docker-build-base: docker-rmi-for-build-base
+.PHONY: docker-build-development-cache
+docker-build-development-cache: docker-rmi-for-build-development-cache
 	docker build \
 		--tag $(DOCKER_IMAGE_TAG) \
 		.
@@ -42,8 +42,8 @@ docker-rmi-for-build:
 		$(DOCKER_IMAGE_NAME):$(GIT_VERSION) \
 		$(DOCKER_IMAGE_NAME)
 
-.PHONY: docker-rmi-for-build-base
-docker-rmi-for-build-base:
+.PHONY: docker-rmi-for-build-development-cache
+docker-rmi-for-build-development-cache:
 	-docker rmi --force $(DOCKER_IMAGE_TAG)
 
 .PHONY: clean

diff --git a/README.md b/README.md
@@ -68,8 +68,12 @@ This repository assumes a working knowledge of:
 
 Configuration values specified by environment variable or command line parameter.
 
+- **[SENZING_DATA_VERSION_DIR](https://github.com/Senzing/knowledge-base/blob/master/lists/environment-variables.md#senzing_data_version_dir)**
 - **[SENZING_DATABASE_URL](https://github.com/Senzing/knowledge-base/blob/master/lists/environment-variables.md#senzing_database_url)**
 - **[SENZING_DEBUG](https://github.com/Senzing/knowledge-base/blob/master/lists/environment-variables.md#senzing_debug)**
+- **[SENZING_ETC_DIR](https://github.com/Senzing/knowledge-base/blob/master/lists/environment-variables.md#senzing_etc_dir)**
+- **[SENZING_G2_DIR](https://github.com/Senzing/knowledge-base/blob/master/lists/environment-variables.md#senzing_g2_dir)**
+- **[SENZING_VAR_DIR](https://github.com/Senzing/knowledge-base/blob/master/lists/environment-variables.md#senzing_var_dir)**
 
 ### Volumes
 
@@ -125,7 +129,7 @@ Create a folder for each output directory.
     export DATABASE_DATABASE=G2
     ```
 
-1. Run the docker container.
+1. Run docker container.
    Example:
 
     ```console
@@ -138,8 +142,8 @@ Create a folder for each output directory.
       --rm \
       --tty \
       --volume ${SENZING_DATA_VERSION_DIR}:/opt/senzing/data \
-      --volume ${SENZING_G2_DIR}:/opt/senzing/g2 \
       --volume ${SENZING_ETC_DIR}:/etc/opt/senzing \
+      --volume ${SENZING_G2_DIR}:/opt/senzing/g2 \
       --volume ${SENZING_VAR_DIR}:/var/opt/senzing \
       senzing/template
     ```
@@ -197,6 +201,8 @@ see [Environment Variables](https://github.com/Senzing/knowledge-base/blob/maste
     sudo make docker-build
     ```
 
+    Note: `sudo make docker-build-development-cache` can be used to create cached docker layers.
+
 ## Examples
 
 ## Errors