Merge pull request #262 from compose-generator/release/v1.6.x

Release of version 1.6.0

.github/dependabot.yml

@@ -8,7 +8,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.6.x
+    target-branch: release/v1.7.x
     reviewers:
       - marcauberer
     assignees:
@@ -22,7 +22,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.6.x
+    target-branch: release/v1.7.x
     reviewers:
       - marcauberer
     assignees:
@@ -36,7 +36,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.6.x
+    target-branch: release/v1.7.x
     reviewers:
       - marcauberer
     assignees:
@@ -50,7 +50,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.6.x
+    target-branch: release/v1.7.x
     reviewers:
       - marcauberer
     assignees:

.github/scripts/service-tester/predefined-service-tester.py

@@ -62,7 +62,22 @@ def test_combination(comb):
 
 def reset_environment():
     """Deletes all Docker related stuff. Should be executed after each test"""
-    system("docker system prune -af > /dev/null")
+    print("Pruning containers ...", end='')
+    system("docker container prune -f > /dev/null")
+    print(" done")
+
+    print("Pruning images ...", end='')
+    system("docker image rm -f $(docker images -a | grep -v \"compose-generator-toolbox\" | awk 'NR>1 {print $3}') > /dev/null");
+    print(" done")
+
+    print("Pruning networks ...", end='')
+    system("docker network prune -f > /dev/null")
+    print(" done")
+
+    print("Pruning build cache ...", end='')
+    system("docker builder prune -af > /dev/null")
+    print(" done")
+
     system(f"sudo rm -rf {BIN_PATH}/*")
 
 

.github/workflows/publish.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.17.x
 
       - name: Cache Go modules
         uses: actions/cache@v2
@@ -60,7 +60,7 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
-          version: v1.1.0
+          version: v1.2.2
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -140,10 +140,12 @@ jobs:
       matrix:
         config:
           - {
-              arch: amd64, label: x64
+              arch: amd64,
+              label: x64
             }
           - {
-              arch: 386, label: x86
+              arch: 386,
+              label: x86
             }
     steps:
       - name: Checkout

.goreleaser.yml

@@ -222,6 +222,8 @@ nfpms:
         type: symlink
       - src: bash_autocomplete.sh
         dst: /etc/bash_completion.d/compose-generator
+      - dst: /usr/lib/compose-generator
+        type: dir
       - dst: /usr/lib/compose-generator/templates
         type: dir
       - dst: /var/log/compose-generator

README.md

@@ -56,7 +56,7 @@ There are downloadable packages available for all supported platforms:
 | **Windows Portable (zip)**  | [download](https://github.com/compose-generator/compose-generator/releases/latest/download/compose-generator_windows_amd64.zip)   | [download](https://github.com/compose-generator/compose-generator/releases/latest/download/compose-generator_windows_386.zip) | -                                                                                                                       | -                                                                                                                       | -                                                                                                                       | -                                                                                                                       |
 
 ## Contribute by providing predefined templates
-If you miss a predefined template and you want to create one for the public, please read the [instructions to create a template](./predefined-services/README.md). Fork the repository, create the template and open a pr against the `release/v1.6.x` branch.
+If you miss a predefined template and you want to create one for the public, please read the [instructions to create a template](./predefined-services/README.md). Fork the repository, create the template and open a pr against the `release/v1.7.x` branch.
 The community is thankful for every predefined template!
 
 ## Contribute otherwise to the project

docs/mkdocs.yml

@@ -5,7 +5,7 @@ site_author: Marc Auberer
 copyright: Made with ❤️ by Compose Generator contributors, powered by <a href="https://www.chillibits.com" target="_blank">ChilliBits</a>.
 repo_name: compose-generator/compose-generator
 repo_url: https://github.com/compose-generator/compose-generator
-edit_uri: edit/release/v1.6.x/docs/docs/
+edit_uri: edit/release/v1.7.x/docs/docs/
 
 theme:
   name: material

media/readme-dockerhub.md

@@ -20,7 +20,8 @@
 - **Where to get help:** [Official Website](https://www.compose-generator.com), [GitHub](https://github.com/compose-generator/compose-generator)
 
 ## Supported tags and respective `Dockerfile` links
-- `1.5.0`, `1.5`, `1`, `latest`
+- `1.6.0`, `1.6`, `1`, `latest`
+- `1.5.0`, `1.5`
 - `1.4.0`, `1.4`
 - `1.3.0`, `1.3`
 - `1.2.1`, `1.2`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@compose-generator/cli",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "description": "Easy to use cli tool to generate Docker Compose configurations",
   "main": "index.js",
   "directories": {

predefined-services/backend/spring-gradle/config.json

@@ -32,7 +32,7 @@
         {
             "text": "Spring version",
             "type": 2,
-            "defaultValue": "2.6.1",
+            "defaultValue": "2.6.2",
             "variable": "SPRING_GRADLE_VERSION"
         },
         {

predefined-services/backend/spring-maven/config.json

@@ -36,7 +36,7 @@
         {
             "text": "Spring version",
             "type": 2,
-            "defaultValue": "2.6.1",
+            "defaultValue": "2.6.2",
             "variable": "SPRING_MAVEN_VERSION"
         },
         {