Merge branch 'release/4.8.1-4alvistack4'

alvistack · Mar 5, 2020 · aed6ce0 · aed6ce0
2 parents 0f57e21 + 5fe8a8b
commit aed6ce0
Show file tree

Hide file tree

Showing 34 changed files with 282 additions and 485 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,7 @@ script:
 
 after_success:
   - |
-    docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
+    echo "$DOCKER_PASSWORD" | docker login --username="$DOCKER_USERNAME" --password-stdin
     export IMAGE=$(docker images | awk '{print $3}' | awk 'NR==2')
     export REPO=$(echo $TRAVIS_REPO_SLUG | sed 's/\/docker-/\//g')
     if [[ -n "$TRAVIS_TAG" ]] && [[ "$TRAVIS_TAG" =~ ^$MOLECULE_SCENARIO_NAME ]]; then

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,12 @@
 
 ### Major Changes
 
-## 4.8.1-4alvistack1 - 2020-03-04
+## 4.8.1-4alvistack4 - 2020-03-05
 
 ### Major Changes
 
   - Revamp with Molecule and `docker commit`
+  - Consolidate molecule tests into `default` (noop)
   - Hotfix for systemd
 
 ## 4.8.0-3alvistack1 - 2020-01-15

diff --git a/README.md b/README.md
@@ -143,7 +143,9 @@ For evaluations you can use the built-in database that will store its files in t
 
 ## Versioning
 
-The `latest` tag matches the most recent version of this repository. Thus using `alvistack/fisheye:latest` or `alvistack/fisheye` will ensure you are running the most up to date version of this image.
+The `latest` tag matches the most recent [GitHub Release](https://github.com/alvistack/docker-fisheye/releases) of this repository. Thus using `alvistack/fisheye:latest` or `alvistack/fisheye` will ensure you are running the most up to date stable version of this image.
+
+Other tags are rolling release rebuild by [Travis](https://travis-ci.org/alvistack/docker-fisheye) in weekly basis. Thus using these tags will ensure you are running the latest packages provided by the base image project.
 
 ## License
 

diff --git a/galaxy.yml b/galaxy.yml
@@ -18,7 +18,7 @@ namespace: alvistack
 name: docker-fisheye
 description: Docker Image Packaging for Atlassian Fisheye
 
-version: MAJOR.MINOR.PATCH
+version: VERSION
 readme: README.md
 license: Apache-2.0
 

diff --git a/molecule/4.7/converge.yml b/molecule/4.7/converge.yml
diff --git a/molecule/4.7/converge.yml b/molecule/4.7/converge.yml
@@ -0,0 +1 @@
+../default/converge.yml
diff --git a/molecule/4.7/create.yml b/molecule/4.7/create.yml
diff --git a/molecule/4.7/create.yml b/molecule/4.7/create.yml
@@ -0,0 +1 @@
+../default/create.yml
diff --git a/molecule/4.7/destroy.yml b/molecule/4.7/destroy.yml
diff --git a/molecule/4.7/destroy.yml b/molecule/4.7/destroy.yml
@@ -0,0 +1 @@
+../default/destroy.yml
diff --git a/molecule/4.7/prepare.yml b/molecule/4.7/prepare.yml
diff --git a/molecule/4.7/prepare.yml b/molecule/4.7/prepare.yml
@@ -0,0 +1 @@
+../default/prepare.yml
diff --git a/molecule/4.7/verify.yml b/molecule/4.7/verify.yml
diff --git a/molecule/4.7/verify.yml b/molecule/4.7/verify.yml
@@ -0,0 +1 @@
+../default/verify.yml
diff --git a/molecule/4.8/converge.yml b/molecule/4.8/converge.yml
diff --git a/molecule/4.8/converge.yml b/molecule/4.8/converge.yml
@@ -0,0 +1 @@
+../default/converge.yml
diff --git a/molecule/4.8/create.yml b/molecule/4.8/create.yml
diff --git a/molecule/4.8/create.yml b/molecule/4.8/create.yml
@@ -0,0 +1 @@
+../default/create.yml