Rebuild using docker-template v1.2.

gearboxworks · Apr 1, 2020 · a71fc0f · a71fc0f
1 parent f5badfd
commit a71fc0f
Show file tree

Hide file tree

Showing 47 changed files with 599 additions and 572 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+*/logs/*.log
 .*.swp
 *.OLD
 docker-template

diff --git a/1.12.2/.env b/1.12.2/.env
diff --git a/1.12.2/logs/.keep b/1.12.2/logs/.keep
diff --git a/1.13.12/.env b/1.13.12/.env
diff --git a/1.13.12/gearbox.json b/1.13.12/gearbox.json
diff --git a/1.13.12/logs/.keep b/1.13.12/logs/.keep
diff --git a/1.14.2/.env b/1.14.2/.env
diff --git a/1.14.2/gearbox.json b/1.14.2/gearbox.json
diff --git a/1.14.2/logs/.keep b/1.14.2/logs/.keep
diff --git a/1.15.9/.env b/1.15.9/.env
diff --git a/1.15.9/gearbox.json b/1.15.9/gearbox.json
diff --git a/1.15.9/logs/.keep b/1.15.9/logs/.keep
diff --git a/Makefile b/Makefile
@@ -57,6 +57,9 @@ endif
 
 ################################################################################
 # Image related commands.
+.DEFAULT:
+	@make -k help
+
 default: all
 
 all:
@@ -65,6 +68,8 @@ all:
 help:
 	@echo "################################################################################"
 	@echo "init				- Initialize repository from TEMPLATE."
+	@echo "update				- Update repository TEMPLATE."
+	@echo "git-release			- Generate a repository release."
 	@echo ""
 	@echo "clean-[all | <VERSION>]		- Clean runtime container image."
 	@echo "build-[all | <VERSION>]		- Generate runtime container image."
@@ -102,6 +107,15 @@ init: *.json
 	@./bin/create-version.sh "all"
 
 
+################################################################################
+update:
+	@./bin/TemplateUpdate.sh
+	@make init
+
+git-release:
+	@./bin/TemplateRelease.sh
+
+
 ################################################################################
 info:
 	@./bin/$@.sh $(VERSION)

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-![Gearbox](https://github.com/gearboxworks/gearbox.github.io/raw/master/Gearbox-100x.png)
+![Gearbox](https://raw.githubusercontent.com/gearboxworks/gearboxworks.github.io/master/assets/images/gearbox-logo.png)
 
 
-# Another [Gearbox](https://github.com/gearboxworks/) Docker container service - nginx
-This is the repository for the [nginx](<no value>) Docker container implemented for [Gearbox](https://github.com/gearboxworks/).
+# nginx Docker container service for [Gearbox](https://github.com/gearboxworks/)
+This is the repository for the [nginx](unknown) Docker container implemented for [Gearbox](https://github.com/gearboxworks/).
 
 
 ## Repository Info
@@ -12,13 +12,12 @@ GitHub release(latest): ![last-release-date](https://img.shields.io/github/relea
 
 
 ## Supported versions and respective Dockerfiles
-| Service | GitHub Version | Docker Version | Docker Size | Docker Tags | Dockerfile |
-| ------- | -------------- | -------------- | ----------- | ----------- | ---------- |
-| nginx | ![nginx](https://img.shields.io/badge/nginx-1.12.2-green.svg) | ![Docker Version)](https://img.shields.io/docker/v/gearboxworks/nginx/1.12.2) | ![Docker Size](https://img.shields.io/docker/image-size/gearboxworks/nginx/1.12.2) | `1.12.2`, `1.12` | _([1.12.2/DockerfileRuntime](https://github.com/gearboxworks/docker-nginx/blob/master/1.12/DockerfileRuntime))_ |
-| nginx | ![nginx](https://img.shields.io/badge/nginx-1.13.12-green.svg) | ![Docker Version)](https://img.shields.io/docker/v/gearboxworks/nginx/1.13.12) | ![Docker Size](https://img.shields.io/docker/image-size/gearboxworks/nginx/1.13.12) | `1.13.12`, `1.13` | _([1.13.12/DockerfileRuntime](https://github.com/gearboxworks/docker-nginx/blob/master/1.13/DockerfileRuntime))_ |
-| nginx | ![nginx](https://img.shields.io/badge/nginx-1.14.2-green.svg) | ![Docker Version)](https://img.shields.io/docker/v/gearboxworks/nginx/1.14.2) | ![Docker Size](https://img.shields.io/docker/image-size/gearboxworks/nginx/1.14.2) | `1.14.2`, `1.14` | _([1.14.2/DockerfileRuntime](https://github.com/gearboxworks/docker-nginx/blob/master/1.14/DockerfileRuntime))_ |
-| nginx | ![nginx](https://img.shields.io/badge/nginx-1.15.9-green.svg) | ![Docker Version)](https://img.shields.io/docker/v/gearboxworks/nginx/1.15.9) | ![Docker Size](https://img.shields.io/docker/image-size/gearboxworks/nginx/1.15.9) | `1.15.9`, `1.15`, `latest` | _([1.15.9/DockerfileRuntime](https://github.com/gearboxworks/docker-nginx/blob/master/1.15/DockerfileRuntime))_ |
-
+| Service | GitHub Version | Docker Version | Docker Size | Docker Tags |
+| ------- | -------------- | -------------- | ----------- | ----------- |
+| [nginx](unknown) | ![nginx](https://img.shields.io/badge/nginx-1.12.2-green.svg) | ![Docker Version)](https://img.shields.io/docker/v/gearboxworks/nginx/1.12.2) | ![Docker Size](https://img.shields.io/docker/image-size/gearboxworks/nginx/1.12.2) | _([`1.12.2`, `1.12`](https://github.com/gearboxworks/docker-nginx/blob/master/1.12/DockerfileRuntime))_ |
+| [nginx](unknown) | ![nginx](https://img.shields.io/badge/nginx-1.13.12-green.svg) | ![Docker Version)](https://img.shields.io/docker/v/gearboxworks/nginx/1.13.12) | ![Docker Size](https://img.shields.io/docker/image-size/gearboxworks/nginx/1.13.12) | _([`1.13.12`, `1.13`](https://github.com/gearboxworks/docker-nginx/blob/master/1.13/DockerfileRuntime))_ |
+| [nginx](unknown) | ![nginx](https://img.shields.io/badge/nginx-1.14.2-green.svg) | ![Docker Version)](https://img.shields.io/docker/v/gearboxworks/nginx/1.14.2) | ![Docker Size](https://img.shields.io/docker/image-size/gearboxworks/nginx/1.14.2) | _([`1.14.2`, `1.14`](https://github.com/gearboxworks/docker-nginx/blob/master/1.14/DockerfileRuntime))_ |
+| [nginx](unknown) | ![nginx](https://img.shields.io/badge/nginx-1.15.9-green.svg) | ![Docker Version)](https://img.shields.io/docker/v/gearboxworks/nginx/1.15.9) | ![Docker Size](https://img.shields.io/docker/image-size/gearboxworks/nginx/1.15.9) | _([`1.15.9`, `1.15`, `latest`](https://github.com/gearboxworks/docker-nginx/blob/master/1.15/DockerfileRuntime))_ |
 
 
 ## Using this container.
@@ -45,7 +44,7 @@ Simply clone this repository to your local machine
 `make push` - Push already built Docker images to Docker Hub, (only for Gearbox admins). Push all versions from the base directory or specific versions from each directory.
 
 ### Runtime from GitHub repo
-When you `cd` into a version directory you can also perform a few more actions.
+You can either build your container as above, or use it from DockerHub with these commands:
 
 `make start` - Spin up a Docker container with the correct runtime configs.
 

diff --git a/TEMPLATE/Makefile b/TEMPLATE/Makefile
@@ -57,6 +57,9 @@ endif
 
 ################################################################################
 # Image related commands.
+.DEFAULT:
+	@make -k help
+
 default: all
 
 all:
@@ -65,6 +68,8 @@ all:
 help:
 	@echo "################################################################################"
 	@echo "init				- Initialize repository from TEMPLATE."
+	@echo "update				- Update repository TEMPLATE."
+	@echo "git-release			- Generate a repository release."
 	@echo ""
 	@echo "clean-[all | <VERSION>]		- Clean runtime container image."
 	@echo "build-[all | <VERSION>]		- Generate runtime container image."
@@ -102,6 +107,15 @@ init: *.json
 	@./bin/create-version.sh "all"
 
 
+################################################################################
+update:
+	@./bin/TemplateUpdate.sh
+	@make init
+
+git-release:
+	@./bin/TemplateRelease.sh
+
+
 ################################################################################
 info:
 	@./bin/$@.sh $(VERSION)