Fix service template updates (#184)

* Optimize README

* Fix ASP.NET template

* Update service template versions

* Fix predefined service template updates

* Fix tests

* Fix ASP.NET template

.goreleaser.yml

@@ -222,6 +222,7 @@ nfpms:
         type: symlink
     empty_folders:
       - /usr/lib/compose-generator/templates
+      - /usr/lib/compose-generator/log
 release:
   name_template: v{{ .Tag }}
   prerelease: auto

README.md

@@ -16,9 +16,10 @@
 
 ---
 
-## Documentation
 **Please visit the documentation on [compose-generator.com](https://www.compose-generator.com).**
 
+If Compose Generator helps you, please consider a GitHub star star! ⭐
+
 ### Install Compose Generator
 To install Compose Generator on your system, please visit the [installation section](https://www.compose-generator.com/install/linux/) in the documentation. Compose Generator is available for the latest versions of Alpine, CentOS, Debian, Fedora, Raspbian, Ubuntu and Windows. If you want to install Compose Generator manually by downloading a package file, please take a look at the table below.
 
@@ -55,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 one](./predefined-services/README.md). Fork the repository, create the template and open a pr to the latest `release/v...` 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 latest `release/v...` branch.
 The community is thankful for every predefined template!
 
 ## Contribute otherwise to the project

predefined-services/backend/aspnet/backend-aspnet/Dockerfile

@@ -1,4 +1,5 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build-env
+# Builder
+FROM mcr.microsoft.com/dotnet/sdk:${{DOTNET_VERSION}} AS builder
 WORKDIR /app
 
 COPY *.csproj ./
@@ -7,8 +8,10 @@ RUN dotnet restore
 COPY . .
 RUN dotnet publish -c Release -o out
 
-FROM mcr.microsoft.com/dotnet/aspnet:3.1
+
+# Minimalistic image
+FROM mcr.microsoft.com/dotnet/aspnet:${{ASPNET_VERSION}}
 WORKDIR /app
-COPY --from=build-env /app/out .
+COPY --from=builder /app/out .
 EXPOSE 80
-ENTRYPOINT ["dotnet", "backend.dll"]
+ENTRYPOINT [ "dotnet", "${{ASPNET_APP_NAME}}.dll" ]

predefined-services/backend/aspnet/config.json

@@ -3,8 +3,9 @@
     "preselected": "false",
     "proxied": true,
     "demoAppInitCmd": [
-        "cd ${{ASPNET_SOURCE_DIRECTORY}}",
-        "dotnet new webapp"
+        "dotnet new webapp --force --name ${{ASPNET_APP_NAME}}",
+        "mv ./${{ASPNET_APP_NAME}}/* ./${{ASPNET_SOURCE_DIRECTORY}}/",
+        "rm -rf ./${{ASPNET_APP_NAME}}"
     ],
     "files": [
         {
@@ -14,6 +15,10 @@
         {
             "path": "README.md",
             "type": "docs"
+        },
+        {
+            "path": "${{ASPNET_SOURCE_DIRECTORY}}/Dockerfile",
+            "type": "config"
         }
     ],
     "questions": [
@@ -27,7 +32,13 @@
         {
             "text": "Which .NET version do you want to use?",
             "type": 2,
-            "defaultValue": "3.2.3",
+            "defaultValue": "5.0",
+            "variable": "DOTNET_VERSION"
+        },
+        {
+            "text": "Which ASP.NET version do you want to use?",
+            "type": 2,
+            "defaultValue": "3.1",
             "variable": "ASPNET_VERSION"
         },
         {

predefined-services/backend/django/config.json

@@ -35,7 +35,7 @@
         {
             "text": "Which Django version do you want to use?",
             "type": 2,
-            "defaultValue": "3.2.7",
+            "defaultValue": "3.2.8",
             "variable": "DJANGO_VERSION"
         },
         {

predefined-services/backend/nexus/config.json

@@ -23,7 +23,7 @@
         {
             "text": "Which version of Nexus do you want to use?",
             "type": 2,
-            "defaultValue": "3.34.0",
+            "defaultValue": "3.35.0",
             "variable": "NEXUS_VERSION"
         }
     ],

predefined-services/backend/node/config.json

@@ -32,7 +32,7 @@
         {
             "text": "Which version of Node do you want to use?",
             "type": 2,
-            "defaultValue": "16.9",
+            "defaultValue": "17.0",
             "variable": "NODE_VERSION"
         }
     ],

predefined-services/backend/prometheus/config.json

@@ -23,7 +23,7 @@
         {
             "text": "Which version of Prometheus do you want to use?",
             "type": 2,
-            "defaultValue": "2.30.0",
+            "defaultValue": "2.30.3",
             "variable": "PROMETHEUS_VERSION"
         }
     ],

predefined-services/database/elasticsearch/config.json

@@ -23,7 +23,7 @@
         {
             "text": "Which Elasticsearch version do you want to use?",
             "type": 2,
-            "defaultValue": "7.14.1",
+            "defaultValue": "7.14.2",
             "variable": "ELASTICSEARCH_VERSION",
             "advanced": true
         }

predefined-services/database/faunadb/config.json

@@ -30,7 +30,7 @@
         {
             "text": "Which FaunaDB version do you want to use?",
             "type": 2,
-            "defaultValue": "4.2.0",
+            "defaultValue": "4.3.0",
             "variable": "FAUNADB_VERSION",
             "advanced": true
         }

predefined-services/database/postgres/config.json

@@ -56,7 +56,7 @@
         {
             "text": "Which Postgres version do you want to use?",
             "type": 2,
-            "defaultValue": "13.4",
+            "defaultValue": "14.0",
             "variable": "POSTGRES_VERSION",
             "advanced": true
         }

predefined-services/frontend/bitbucket/config.json

@@ -54,7 +54,7 @@
         {
             "text": "Which version of BitBucket do you want to use?",
             "type": 2,
-            "defaultValue": "7.16",
+            "defaultValue": "7.17",
             "variable": "BITBUCKET_VERSION"
         }
     ],

predefined-services/frontend/gitlab/config.json

@@ -37,7 +37,7 @@
         {
             "text": "Which version of GitLab do you want to use?",
             "type": 2,
-            "defaultValue": "14.3.0",
+            "defaultValue": "14.3.3",
             "variable": "GITLAB_VERSION",
             "advanced": true
         }

predefined-services/frontend/grafana/config.json

@@ -23,7 +23,7 @@
         {
             "text": "Which version of Grafana do you want to use?",
             "type": 2,
-            "defaultValue": "8.1.5",
+            "defaultValue": "8.2.1",
             "variable": "GRAFANA_VERSION",
             "advanced": true
         }

predefined-services/frontend/jira/config.json

@@ -27,7 +27,7 @@
         {
             "text": "Which version of Jira do you want to use?",
             "type": 2,
-            "defaultValue": "8.19",
+            "defaultValue": "8.20",
             "variable": "JIRA_VERSION",
             "advanced": true
         },

predefined-services/frontend/nextcloud/config.json

@@ -27,7 +27,7 @@
         {
             "text": "Which version of Nextcloud do you want to use?",
             "type": 2,
-            "defaultValue": "22.1",
+            "defaultValue": "22.2",
             "variable": "NEXTCLOUD_VERSION"
         },
         {

predefined-services/frontend/openproject/config.json

@@ -27,7 +27,7 @@
         {
             "text": "Which version of OpenProject do you want to use?",
             "type": 2,
-            "defaultValue": "11",
+            "defaultValue": "11.4",
             "variable": "OPENPROJECT_VERSION"
         },
         {

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.6.3",
+            "defaultValue": "1.9.1",
             "variable": "UPTIME_KUMA_VERSION"
         }
     ],

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.3.26792",
+            "defaultValue": "2021.3.30245",
             "variable": "YOUTRACK_VERSION",
             "advanced": true
         }

src/util/env.go

@@ -52,9 +52,8 @@ func GetDockerVersion() string {
 
 // GetCustomTemplatesPath returns the path to the custom templates directory
 func GetCustomTemplatesPath() string {
-	templatesPath := "/usr/lib/compose-generator/templates"
-	if fileExists(templatesPath) {
-		return templatesPath // Linux
+	if fileExists("/usr/bin/compose-generator") {
+		return "/usr/lib/compose-generator/templates" // Linux
 	}
 	filename, err := executable()
 	if err != nil {
@@ -71,9 +70,8 @@ func GetCustomTemplatesPath() string {
 
 // GetPredefinedServicesPath returns the path to the predefined services directory
 func GetPredefinedServicesPath() string {
-	psPathLinux := "/usr/lib/compose-generator/predefined-services"
-	if fileExists(psPathLinux) {
-		return psPathLinux // Linux
+	if fileExists("/usr/bin/compose-generator") {
+		return "/usr/lib/compose-generator/predefined-services" // Linux
 	}
 	filename, err := executable()
 	if err != nil {
@@ -122,9 +120,8 @@ func IsDockerRunning() bool {
 // --------------------------------------------------------------- Private functions ---------------------------------------------------------------
 
 func getLogfilesPath() string {
-	logPathLinux := "/usr/lib/compose-generator/log"
-	if fileExists(logPathLinux) {
-		return logPathLinux // Linux
+	if fileExists("/usr/bin/compose-generator") {
+		return "/usr/lib/compose-generator/log" // Linux
 	}
 	filename, err := executable()
 	if err != nil {

src/util/env_test.go

@@ -73,29 +73,27 @@ func TestIsCIEnvironment2(t *testing.T) {
 
 func TestGetCustomTemplatesPath1(t *testing.T) {
 	// Test data
-	pathLinux := "/usr/lib/compose-generator/templates"
 	// Mock functions
 	fileExists = func(path string) bool {
-		assert.Equal(t, pathLinux, path)
+		assert.Equal(t, "/usr/bin/compose-generator", path)
 		return true
 	}
 	// Execute test
 	result := GetCustomTemplatesPath()
 	// Assert
-	assert.Equal(t, pathLinux, result)
+	assert.Equal(t, "/usr/lib/compose-generator/templates", result)
 }
 
 func TestGetCustomTemplatesPath2(t *testing.T) {
 	// Test data
-	pathLinux := "/usr/lib/compose-generator/templates"
 	pathWindowsDocker := "/usr/bin/compose-generator/test/path/templates"
 	pathExecutable := "/usr/bin/compose-generator/test/path/dir"
 	// Mock functions
 	fileExistsCallCount := 0
 	fileExists = func(path string) bool {
 		fileExistsCallCount++
 		if fileExistsCallCount == 1 {
-			assert.Equal(t, pathLinux, path)
+			assert.Equal(t, "/usr/bin/compose-generator", path)
 			return false
 		}
 		assert.Equal(t, pathWindowsDocker, path)
@@ -115,15 +113,14 @@ func TestGetCustomTemplatesPath2(t *testing.T) {
 
 func TestGetCustomTemplatesPath3(t *testing.T) {
 	// Test data
-	pathLinux := "/usr/lib/compose-generator/templates"
 	pathWindowsDocker := "/usr/bin/compose-generator/test/path/templates"
 	pathExecutable := "/usr/bin/compose-generator/test/path/dir"
 	// Mock functions
 	fileExistsCallCount := 0
 	fileExists = func(path string) bool {
 		fileExistsCallCount++
 		if fileExistsCallCount == 1 {
-			assert.Equal(t, pathLinux, path)
+			assert.Equal(t, "/usr/bin/compose-generator", path)
 			return false
 		}
 		assert.Equal(t, pathWindowsDocker, path)
@@ -147,7 +144,6 @@ func TestGetCustomTemplatesPath3(t *testing.T) {
 
 func TestGetCustomTemplatesPath4(t *testing.T) {
 	// Test data
-	pathLinux := "/usr/lib/compose-generator/templates"
 	pathWindowsDocker := "/usr/bin/compose-generator/test/path/templates"
 	pathExecutable := "/usr/bin/compose-generator/test/path/dir"
 	pathDev := "../templates"
@@ -156,7 +152,7 @@ func TestGetCustomTemplatesPath4(t *testing.T) {
 	fileExists = func(path string) bool {
 		fileExistsCallCount++
 		if fileExistsCallCount == 1 {
-			assert.Equal(t, pathLinux, path)
+			assert.Equal(t, "/usr/bin/compose-generator", path)
 			return false
 		}
 		assert.Equal(t, pathWindowsDocker, path)
@@ -206,30 +202,27 @@ func TestGetUsername2(t *testing.T) {
 // ----------------------------------------------------------- GetPredefinedServicesPath -----------------------------------------------------------
 
 func TestGetPredefinedServicesPath1(t *testing.T) {
-	// Test data
-	pathLinux := "/usr/lib/compose-generator/predefined-services"
 	// Mock functions
 	fileExists = func(path string) bool {
-		assert.Equal(t, pathLinux, path)
+		assert.Equal(t, "/usr/bin/compose-generator", path)
 		return true
 	}
 	// Execute test
 	result := GetPredefinedServicesPath()
 	// Assert
-	assert.Equal(t, pathLinux, result)
+	assert.Equal(t, "/usr/lib/compose-generator/predefined-services", result)
 }
 
 func TestGetPredefinedServicesPath2(t *testing.T) {
 	// Test data
-	pathLinux := "/usr/lib/compose-generator/predefined-services"
 	pathWindowsDocker := "/usr/bin/compose-generator/test/path/predefined-services"
 	pathExecutable := "/usr/bin/compose-generator/test/path/dir"
 	// Mock functions
 	fileExistsCallCount := 0
 	fileExists = func(path string) bool {
 		fileExistsCallCount++
 		if fileExistsCallCount == 1 {
-			assert.Equal(t, pathLinux, path)
+			assert.Equal(t, "/usr/bin/compose-generator", path)
 			return false
 		}
 		assert.Equal(t, pathWindowsDocker, path)
@@ -249,15 +242,14 @@ func TestGetPredefinedServicesPath2(t *testing.T) {
 
 func TestGetPredefinedServicesPath3(t *testing.T) {
 	// Test data
-	pathLinux := "/usr/lib/compose-generator/predefined-services"
 	pathWindowsDocker := "/usr/bin/compose-generator/test/path/predefined-services"
 	pathExecutable := "/usr/bin/compose-generator/test/path/dir"
 	// Mock functions
 	fileExistsCallCount := 0
 	fileExists = func(path string) bool {
 		fileExistsCallCount++
 		if fileExistsCallCount == 1 {
-			assert.Equal(t, pathLinux, path)
+			assert.Equal(t, "/usr/bin/compose-generator", path)
 			return false
 		}
 		assert.Equal(t, pathWindowsDocker, path)
@@ -281,7 +273,6 @@ func TestGetPredefinedServicesPath3(t *testing.T) {
 
 func TestGetPredefinedServicesPath4(t *testing.T) {
 	// Test data
-	pathLinux := "/usr/lib/compose-generator/predefined-services"
 	pathWindowsDocker := "/usr/bin/compose-generator/test/path/predefined-services"
 	pathExecutable := "/usr/bin/compose-generator/test/path/dir"
 	pathDev := "../predefined-services"
@@ -290,7 +281,7 @@ func TestGetPredefinedServicesPath4(t *testing.T) {
 	fileExists = func(path string) bool {
 		fileExistsCallCount++
 		if fileExistsCallCount == 1 {
-			assert.Equal(t, pathLinux, path)
+			assert.Equal(t, "/usr/bin/compose-generator", path)
 			return false
 		}
 		assert.Equal(t, pathWindowsDocker, path)