Go 1.18 upgrade (#295)

* Update Docker registry version * Update diu dependency * Upgrade spinner dependency * Update survey dependency * Update packages in service testing workflow * Fix test script * Upgrade predefined service versions
compose-generator · Mar 25, 2022 · ca887b3 · ca887b3
1 parent f49e368
commit ca887b3
Show file tree

Hide file tree

Showing 72 changed files with 902 additions and 1,947 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         go-version:
           - 1.17.x
-#          - 1.18.x
+          - 1.18.x
         os:
           - ubuntu-latest
           - windows-latest

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17.x
+          go-version: 1.18.x
 
       - name: Cache Go modules
         uses: actions/cache@v3
@@ -60,7 +60,7 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
-          version: v1.4.1
+          version: v1.7.0
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/service-testing.yml b/.github/workflows/service-testing.yml
@@ -16,10 +16,13 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v3
 
+    - name: Upgrade apt packages
+      run: sudo apt-get update && sudo apt-get upgrade -y
+
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
 
     - name: Setup Python
       uses: actions/setup-python@v3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
 
     - name: Checkout code
       uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
       run: bash <(curl -s https://codecov.io/bash)
 
     - name: Install GoSec
-      run: curl -sfL https://raw.githubusercontent.com/securego/gosec/v2.10.0/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.10.0
+      run: curl -sfL https://raw.githubusercontent.com/securego/gosec/v2.11.0/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.11.0
 
     - name: Run security scan
       working-directory: src

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.107.3",
+            "defaultValue": "0.107.5",
             "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.2",
+            "defaultValue": "4.0.3",
             "variable": "DJANGO_VERSION"
         },
         {

diff --git a/predefined-services/backend/docker-registry/config.json b/predefined-services/backend/docker-registry/config.json
@@ -23,7 +23,7 @@
         {
             "text": "Which Docker Registry version do you want to use?",
             "type": 2,
-            "defaultValue": "2.7.1",
+            "defaultValue": "2.8.1",
             "variable": "REGISTRY_VERSION"
         }
     ],

diff --git a/predefined-services/backend/fiber/config.json b/predefined-services/backend/fiber/config.json
@@ -32,7 +32,7 @@
         {
             "text": "Which Go version do you want to use?",
             "type": 2,
-            "defaultValue": "1.17",
+            "defaultValue": "1.18",
             "variable": "FIBER_GO_VERSION"
         },
         {

diff --git a/predefined-services/backend/flask/config.json b/predefined-services/backend/flask/config.json
@@ -46,7 +46,7 @@
         {
             "text": "Which Flask version do you want to use?",
             "type": 2,
-            "defaultValue": "2.0.2",
+            "defaultValue": "2.0.3",
             "variable": "FLASK_VERSION"
         }
     ],

diff --git a/predefined-services/backend/gin/config.json b/predefined-services/backend/gin/config.json
@@ -32,7 +32,7 @@
         {
             "text": "Which Go version do you want to use?",
             "type": 2,
-            "defaultValue": "1.17",
+            "defaultValue": "1.18",
             "variable": "GIN_GO_VERSION"
         },
         {

diff --git a/predefined-services/backend/monica/config.json b/predefined-services/backend/monica/config.json
@@ -34,7 +34,7 @@
         {
             "text": "Which version of Monica do you want to use?",
             "type": 2,
-            "defaultValue": "3.6",
+            "defaultValue": "3.7",
             "variable": "MONICA_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.3",
+            "defaultValue": "3.38.0",
             "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.4",
+            "defaultValue": "17.8",
             "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": "2022.01",
+            "defaultValue": "2022.02.1",
             "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.4",
+            "defaultValue": "1.25.8",
             "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.33.1",
+            "defaultValue": "2.34.0",
             "variable": "PROMETHEUS_VERSION"
         }
     ],

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.1.0",
+            "defaultValue": "3.1.1",
             "variable": "RAILS_RUBY_VERSION"
         },
         {

diff --git a/predefined-services/backend/rocket/config.json b/predefined-services/backend/rocket/config.json
@@ -43,7 +43,7 @@
         {
             "text": "Which version of Rust do you want to use?",
             "type": 2,
-            "defaultValue": "1.58",
+            "defaultValue": "1.59",
             "variable": "ROCKET_RUST_VERSION"
         }
     ],

diff --git a/predefined-services/backend/spring-gradle/config.json b/predefined-services/backend/spring-gradle/config.json
@@ -32,7 +32,7 @@
         {
             "text": "Spring version",
             "type": 2,
-            "defaultValue": "2.6.3",
+            "defaultValue": "2.6.5",
             "variable": "SPRING_GRADLE_VERSION"
         },
         {

diff --git a/predefined-services/backend/spring-maven/config.json b/predefined-services/backend/spring-maven/config.json
@@ -36,7 +36,7 @@
         {
             "text": "Spring version",
             "type": 2,
-            "defaultValue": "2.6.3",
+            "defaultValue": "2.6.5",
             "variable": "SPRING_MAVEN_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.17.0",
+            "defaultValue": "8.1.1",
             "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.8.0",
+            "defaultValue": "4.10.0",
             "variable": "FAUNADB_VERSION",
             "advanced": true
         }

diff --git a/predefined-services/database/mariadb/config.json b/predefined-services/database/mariadb/config.json
@@ -41,7 +41,7 @@
         {
             "text": "Which MariaDB version do you want to use?",
             "type": 2,
-            "defaultValue": "10.7",
+            "defaultValue": "10.8",
             "variable": "MARIADB_VERSION",
             "advanced": true
         }

diff --git a/predefined-services/database/neo4j/config.json b/predefined-services/database/neo4j/config.json
@@ -34,7 +34,7 @@
         {
             "text": "Which Neo4j version do you want to use?",
             "type": 2,
-            "defaultValue": "4.4.3",
+            "defaultValue": "4.4.4",
             "variable": "NEO4J_VERSION",
             "advanced": true
         }

diff --git a/predefined-services/database/postgres/config.json b/predefined-services/database/postgres/config.json
@@ -56,7 +56,7 @@
         {
             "text": "Which Postgres version do you want to use?",
             "type": 2,
-            "defaultValue": "14.1",
+            "defaultValue": "14.2",
             "variable": "POSTGRES_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.3",
+            "defaultValue": "4.6.0",
             "variable": "SCYLLADB_VERSION",
             "advanced": true
         },

diff --git a/predefined-services/frontend/accent/config.json b/predefined-services/frontend/accent/config.json
@@ -26,7 +26,7 @@
         {
             "text": "Which version of Accent do you want to use?",
             "type": 2,
-            "defaultValue": "1.9.1",
+            "defaultValue": "1.10.3",
             "variable": "ACCENT_VERSION"
         }
     ]

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.20",
+            "defaultValue": "7.21",
             "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.34",
+            "defaultValue": "4.41",
             "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.7.1",
+            "defaultValue": "14.9.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.0",
+            "defaultValue": "8.4.4",
             "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.21",
+            "defaultValue": "8.22",
             "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.8",
+            "defaultValue": "6.4.10",
             "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.7",
+            "defaultValue": "4.8",
             "variable": "MATOMO_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.3",
+            "defaultValue": "1.13.1",
             "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.40676",
+            "defaultValue": "2022.1.43911",
             "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.6.0",
+            "defaultValue": "2.6.2",
             "type": 2,
             "variable": "TRAEFIK_PROXY_VERSION",
             "advanced": true

diff --git a/src/go.mod b/src/go.mod
@@ -1,12 +1,12 @@
 module compose-generator
 
-go 1.17
+go 1.18
 
 require (
-	github.com/AlecAivazis/survey/v2 v2.2.13
-	github.com/briandowns/spinner v1.13.0
+	github.com/AlecAivazis/survey/v2 v2.3.4
+	github.com/briandowns/spinner v1.18.1
 	github.com/cli/safeexec v1.0.0
-	github.com/compose-generator/diu v0.0.0-20211016203144-1bbae0eb7ff8
+	github.com/compose-generator/diu v0.0.0-20220316043855-b1b094e33258
 	github.com/compose-spec/compose-go v1.1.0
 	github.com/docker/docker v20.10.14+incompatible
 	github.com/fatih/color v1.13.0
@@ -22,11 +22,11 @@ require (
 
 require (
 	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/containerd/containerd v1.6.1 // indirect
+	github.com/containerd/containerd v1.6.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e // indirect
-	github.com/docker/distribution v2.8.0+incompatible // indirect
+	github.com/docker/distribution v2.8.1+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.1 // indirect
@@ -45,6 +45,7 @@ require (
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect