Merge pull request #269 from compose-generator/release/v1.7.x

Release of version 1.7.0
compose-generator · Jan 13, 2022 · 9a09e1a · 9a09e1a
2 parents 6a53455 + edf3a86
commit 9a09e1a
Show file tree

Hide file tree

Showing 200 changed files with 610 additions and 2,763 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,7 +8,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.7.x
+    target-branch: release/v1.8.x
     reviewers:
       - marcauberer
     assignees:
@@ -22,7 +22,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.7.x
+    target-branch: release/v1.8.x
     reviewers:
       - marcauberer
     assignees:
@@ -36,7 +36,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.7.x
+    target-branch: release/v1.8.x
     reviewers:
       - marcauberer
     assignees:
@@ -50,7 +50,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.7.x
+    target-branch: release/v1.8.x
     reviewers:
       - marcauberer
     assignees:

diff --git a/.github/workflows/copyright.yml b/.github/workflows/copyright.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Check Copyright
         uses: VinnyBabuManjaly/copyright-action@v1.0.0
         with:
-          CopyrightString: '/*\nCopyright © 2021 Compose Generator Contributors\nAll rights reserved.\n*/\n\n'
+          CopyrightString: '/*\nCopyright © 2021-2022 Compose Generator Contributors\nAll rights reserved.\n*/\n\n'
           Path: 'src'
           IgnorePath: 'src/vendor'
           FileType: '.go'

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -60,7 +60,7 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
-          version: v1.2.2
+          version: v1.2.3
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -222,8 +222,6 @@ 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

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2021 Marc Auberer
+   Copyright 2021-2022 Marc Auberer
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img alt="Compose Generator Logo" src="./media/logo-wide.png" height="280" />
+  <img alt="Compose Generator Logo" src="./media/logo-wide_700x359.png" height="280" />
   <h3 align="center">Compose Generator</h3>
   <p align="center">Easy to use cli tool to generate Docker Compose configurations blazingly fast.</p>
   <p align="center">
@@ -56,10 +56,10 @@ 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.7.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.8.x` branch.
 The community is thankful for every predefined template!
 
 ## Contribute otherwise to the project
 If you want to contribute to this project, please ensure you comply with the [contribution guidelines](CONTRIBUTING.md).
 
-© Marc Auberer 2021
+© Marc Auberer 2021-2022
diff --git a/docs/docs/static/logo.png b/docs/docs/static/logo.png
diff --git a/docs/docs/static/logo_original.png b/docs/docs/static/logo_original.png
diff --git a/docs/docs/supported-services.md b/docs/docs/supported-services.md
diff --git a/docs/mkdocs.yml b/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.7.x/docs/docs/
+edit_uri: edit/release/v1.8.x/docs/docs/
 
 theme:
   name: material

diff --git a/media/logo-wide_700x359.png b/media/logo-wide_700x359.png
diff --git a/media/readme-dockerhub.md b/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.6.0`, `1.6`, `1`, `latest`
+- `1.7.0`, `1.7`, `1`, `latest`
+- `1.6.0`, `1.6`
 - `1.5.0`, `1.5`
 - `1.4.0`, `1.4`
 - `1.3.0`, `1.3`
@@ -61,4 +62,4 @@ The community is thankful for every predefined template!
 ## Contribute otherwise to the project
 If you want to contribute to this project, please ensure you comply with the [contribution guidelines](https://github.com/compose-generator/compose-generator/blob/main/CONTRIBUTING.md).
 
-© Marc Auberer 2021
+© Marc Auberer 2021-2022
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@compose-generator/cli",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Easy to use cli tool to generate Docker Compose configurations",
   "main": "index.js",
   "directories": {

diff --git a/predefined-services/backend/adguard-home/config.json b/predefined-services/backend/adguard-home/config.json
@@ -45,7 +45,7 @@
         {
             "text": "Which version of AdGuard Home do you want to use?",
             "type": 2,
-            "defaultValue": "0.106.3",
+            "defaultValue": "0.107.2",
             "variable": "ADGUARD_VERSION"
         }
     ],

diff --git a/predefined-services/backend/django/config.json b/predefined-services/backend/django/config.json
@@ -35,7 +35,7 @@
         {
             "text": "Which Django version do you want to use?",
             "type": 2,
-            "defaultValue": "4.0",
+            "defaultValue": "4.0.1",
             "variable": "DJANGO_VERSION"
         },
         {

diff --git a/predefined-services/backend/nexus/config.json b/predefined-services/backend/nexus/config.json
@@ -23,7 +23,7 @@
         {
             "text": "Which version of Nexus do you want to use?",
             "type": 2,
-            "defaultValue": "3.37.0",
+            "defaultValue": "3.37.3",
             "variable": "NEXUS_VERSION"
         }
     ],

diff --git a/predefined-services/backend/node/config.json b/predefined-services/backend/node/config.json
@@ -32,7 +32,7 @@
         {
             "text": "Which version of Node do you want to use?",
             "type": 2,
-            "defaultValue": "17.2",
+            "defaultValue": "17.3",
             "variable": "NODE_VERSION"
         }
     ],

diff --git a/predefined-services/backend/pi-hole/config.json b/predefined-services/backend/pi-hole/config.json
@@ -22,7 +22,7 @@
         {
             "text": "Which version of Pi-hole do you want to use?",
             "type": 2,
-            "defaultValue": "2021.11",
+            "defaultValue": "2022.01",
             "variable": "PI_HOLE_VERSION"
         }
     ],

diff --git a/predefined-services/backend/plex/config.json b/predefined-services/backend/plex/config.json
@@ -23,7 +23,7 @@
         {
             "text": "Which version of Plex do you want to use?",
             "type": 2,
-            "defaultValue": "1.25.1",
+            "defaultValue": "1.25.2",
             "variable": "PLEX_VERSION"
         }
     ],

diff --git a/predefined-services/backend/prometheus/config.json b/predefined-services/backend/prometheus/config.json
@@ -23,7 +23,7 @@
         {
             "text": "Which version of Prometheus do you want to use?",
             "type": 2,
-            "defaultValue": "2.31.1",
+            "defaultValue": "2.32.1",
             "variable": "PROMETHEUS_VERSION"
         }
     ],

diff --git a/predefined-services/backend/rails/backend-rails/Gemfile b/predefined-services/backend/rails/backend-rails/Gemfile
@@ -4,30 +4,30 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '${{RAILS_RUBY_VERSION}}'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
-gem 'rails', '~> 6.1.4', '>= 6.1.4.1'
+gem 'rails', '~> 7.0.1', '>= 7.0.1'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
-gem 'puma', '~> 5.0'
+gem 'puma', '~> 5.5'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6'
-gem 'sassc', '~> 2.1.0'
+gem 'sassc', '~> 2.4.0'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
-gem 'webpacker', '~> 5.0'
+gem 'webpacker', '~> 5.4'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
 gem 'turbolinks', '~> 5'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 2.7'
+gem 'jbuilder', '~> 2.11'
 # Use Redis adapter to run Action Cable in production
-# gem 'redis', '~> 4.0'
+# gem 'redis', '~> 4.5'
 # Use Active Model has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
+# gem 'bcrypt', '~> 3.1.16'
 
 # Use Active Storage variant
-# gem 'image_processing', '~> 1.2'
+# gem 'image_processing', '~> 1.12'
 
 # Reduces boot times through caching; required in config/boot.rb
-gem 'bootsnap', '>= 1.4.4', require: false
+gem 'bootsnap', '>= 1.9.4', require: false
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -36,18 +36,18 @@ end
 
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
-  gem 'web-console', '>= 4.1.0'
+  gem 'web-console', '>= 4.2.0'
   # Display performance information such as SQL time and flame graphs for each request in your browser.
   # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
-  gem 'rack-mini-profiler', '~> 2.0'
-  gem 'listen', '~> 3.3'
+  gem 'rack-mini-profiler', '~> 2.3'
+  gem 'listen', '~> 3.7'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
 end
 
 group :test do
   # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '>= 3.26'
+  gem 'capybara', '>= 3.36'
   gem 'selenium-webdriver'
   # Easy installation and use of web drivers to run system tests with browsers
   gem 'webdrivers'

diff --git a/predefined-services/backend/rails/config.json b/predefined-services/backend/rails/config.json
@@ -44,7 +44,7 @@
         {
             "text": "Which Ruby version do you want to use (must specified in format x.y.z)?",
             "type": 2,
-            "defaultValue": "3.0.3",
+            "defaultValue": "3.1.0",
             "variable": "RAILS_RUBY_VERSION"
         },
         {

diff --git a/predefined-services/database/elasticsearch/config.json b/predefined-services/database/elasticsearch/config.json
@@ -23,7 +23,7 @@
         {
             "text": "Which Elasticsearch version do you want to use?",
             "type": 2,
-            "defaultValue": "7.14.2",
+            "defaultValue": "7.16.2",
             "variable": "ELASTICSEARCH_VERSION",
             "advanced": true
         }

diff --git a/predefined-services/database/faunadb/config.json b/predefined-services/database/faunadb/config.json
@@ -30,7 +30,7 @@
         {
             "text": "Which FaunaDB version do you want to use?",
             "type": 2,
-            "defaultValue": "4.4.0",
+            "defaultValue": "4.7.0",
             "variable": "FAUNADB_VERSION",
             "advanced": true
         }

diff --git a/predefined-services/database/scylladb/config.json b/predefined-services/database/scylladb/config.json
@@ -34,7 +34,7 @@
         {
             "text": "Which ScyllaDB version do you want to use?",
             "type": 2,
-            "defaultValue": "4.5.1",
+            "defaultValue": "4.5.3",
             "variable": "SCYLLADB_VERSION",
             "advanced": true
         },

diff --git a/predefined-services/frontend/bitbucket/config.json b/predefined-services/frontend/bitbucket/config.json
@@ -54,7 +54,7 @@
         {
             "text": "Which version of BitBucket do you want to use?",
             "type": 2,
-            "defaultValue": "7.18",
+            "defaultValue": "7.19",
             "variable": "BITBUCKET_VERSION"
         }
     ],

diff --git a/predefined-services/frontend/ghost/config.json b/predefined-services/frontend/ghost/config.json
@@ -56,7 +56,7 @@
         {
             "text": "Which version of Ghost do you want to use?",
             "type": 2,
-            "defaultValue": "4.26",
+            "defaultValue": "4.32",
             "variable": "GHOST_VERSION"
         }
     ],

diff --git a/predefined-services/frontend/gitlab/config.json b/predefined-services/frontend/gitlab/config.json
@@ -37,7 +37,7 @@
         {
             "text": "Which version of GitLab do you want to use?",
             "type": 2,
-            "defaultValue": "14.4.4",
+            "defaultValue": "14.6.1",
             "variable": "GITLAB_VERSION",
             "advanced": true
         }

diff --git a/predefined-services/frontend/grafana/config.json b/predefined-services/frontend/grafana/config.json
@@ -23,7 +23,7 @@
         {
             "text": "Which version of Grafana do you want to use?",
             "type": 2,
-            "defaultValue": "8.3.1",
+            "defaultValue": "8.3.3",
             "variable": "GRAFANA_VERSION",
             "advanced": true
         }

diff --git a/predefined-services/frontend/jira/config.json b/predefined-services/frontend/jira/config.json
@@ -27,7 +27,7 @@
         {
             "text": "Which version of Jira do you want to use?",
             "type": 2,
-            "defaultValue": "8.20",
+            "defaultValue": "8.21",
             "variable": "JIRA_VERSION",
             "advanced": true
         },

diff --git a/predefined-services/frontend/jupyter/config.json b/predefined-services/frontend/jupyter/config.json
@@ -39,7 +39,7 @@
         {
             "text": "Which version of Jupyter do you want to use?",
             "type": 2,
-            "defaultValue": "6.4.5",
+            "defaultValue": "6.4.6",
             "variable": "JUPYTER_VERSION",
             "advanced": true
         }

diff --git a/predefined-services/frontend/matomo/config.json b/predefined-services/frontend/matomo/config.json
@@ -27,7 +27,7 @@
         {
             "text": "Which version of Matomo do you want to use?",
             "type": 2,
-            "defaultValue": "4.5",
+            "defaultValue": "4.6",
             "variable": "MATOMO_VERSION"
         }
     ]

diff --git a/predefined-services/frontend/sonarqube/config.json b/predefined-services/frontend/sonarqube/config.json
@@ -27,7 +27,7 @@
         {
             "text": "Which version of SonarQube do you want to use?",
             "type": 2,
-            "defaultValue": "9.2",
+            "defaultValue": "lts",
             "variable": "SONARQUBE_VERSION"
         }
     ],

diff --git a/predefined-services/frontend/uptime-kuma/config.json b/predefined-services/frontend/uptime-kuma/config.json
@@ -23,7 +23,7 @@
         {
             "text": "Which version of Uptime Kuma do you want to use?",
             "type": 2,
-            "defaultValue": "1.11.1",
+            "defaultValue": "1.11.3",
             "variable": "UPTIME_KUMA_VERSION"
         }
     ],

diff --git a/predefined-services/frontend/youtrack/config.json b/predefined-services/frontend/youtrack/config.json
@@ -23,7 +23,7 @@
         {
             "text": "Which version of YouTack do you want to use (latest not available)?",
             "type": 2,
-            "defaultValue": "2021.4.34389",
+            "defaultValue": "2021.4.36872",
             "variable": "YOUTRACK_VERSION",
             "advanced": true
         }

diff --git a/predefined-services/proxy/traefik/config.json b/predefined-services/proxy/traefik/config.json
@@ -32,7 +32,7 @@
         },
         {
             "text": "Which version of of Traefik Proxy do you want to use?",
-            "defaultValue": "2.5.4",
+            "defaultValue": "2.5.6",
             "type": 2,
             "variable": "TRAEFIK_PROXY_VERSION",
             "advanced": true