Merge pull request #15 from cicirello/development

Prep for release [3.12.1]

.github/dependabot.yml

@@ -7,11 +7,11 @@ version: 2
 updates:
   - package-ecosystem: "docker" 
     directory: "/" 
-    target-branch: "development" 
+    target-branch: "master" 
     schedule:
       interval: "daily"
   - package-ecosystem: "github-actions" 
     directory: "/" 
-    target-branch: "development"
+    target-branch: "master"
     schedule:
       interval: "daily"

.github/workflows/docker-image.yml

@@ -2,7 +2,7 @@ name: build
 
 on:
   push:
-    branches: [ master, development ]
+    branches: [ master ]
   pull_request:
     branches: [ master ]
 

Dockerfile

@@ -2,7 +2,7 @@
 # https://www.cicirello.org
 # Source repository: https://github.com/cicirello/alpine-plus-plus
 # Source licensed under the MIT License: https://github.com/cicirello/alpine-plus-plus/blob/master/LICENSE
-FROM alpine:3.12.0
+FROM alpine:3.12.1
 LABEL maintainer="development@cicirello.org" \
     org.opencontainers.image.description="A lightweight docker image for shell scripting and git, \
     consisting of Alpine Linux with the addition of bash, coreutils, findutils, gawk, and git." \

README.md

@@ -41,16 +41,17 @@ The [source repository](https://github.com/cicirello/alpine-plus-plus) is mainta
 
 ## Docker Tags and Versioning Scheme
 
-alpine-plus-plus uses [Semantic Versioning](https://semver.org/) with 
-version numbers of the form: MAJOR.MINOR.PATCH, where differences in 
+Each image pushed to Docker Hub and the Github Container Registry is tagged as follows:
+* The tag `latest` indicates, well, the latest image.
+* __Beginning with version 3.12.1__: tags of the form MAJOR.MINOR.PATCH (such as 3.12.1) indicate the SemVer of the __Alpine__ image used as the base.
+* __Prior to version 3.12.1__: tags of the form MAJOR.MINOR.PATCH (such as 1.0.0) indicate the SemVer of the image, where the base image was Alpine 3.12.0.
+
+[Semantic Versioning](https://semver.org/) uses version numbers 
+of the form: MAJOR.MINOR.PATCH, where differences in 
 MAJOR correspond to incompatible changes, differences in MINOR 
 correspond to introduction of backwards compatible new functionality, 
 and PATCH corresponds to backwards compatible bug fixes.
 
-Each image pushed to Docker Hub and the Github Container Registry is tagged as follows:
-* The tag latest indicates, well, the latest image.
-* Tags of the form MAJOR.MINOR.PATCH (such as 1.0.0) indicate the SemVer of the image.
-
 
 ## Installation and Usage