chg: prepare release

.github/workflows/main-docker-image-mariadb.yml

@@ -19,7 +19,9 @@ jobs:
       matrix:
         include:
           - BUILD_TAG: "latest"
-            IMAGE_TAG: "11.3"
+            IMAGE_TAG: "11.4"
+          - BUILD_TAG: "11.4"
+            IMAGE_TAG: "11.4"
           - BUILD_TAG: "11.3"
             IMAGE_TAG: "11.3"
           - BUILD_TAG: "11.2"

CHANGELOG.md

@@ -5,9 +5,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.6.5] - 2024-05-10
+## [0.6.7] - 2024-06-02
+
+### Changed
+
+- Update default Magento version to v2.4.7-p1.
+- Update default Shopware version to v6.6.3.1.
+- Revamp error handling to use errorspkg
+- Use inline error-handling where possible
+- Update go deps
+- Use gcr mirror for image build
+- Use prebuilt supervisord image instead of building it inline
+- Change varnish and php-fpm health check methods
+- Use a dedicated `OPENSEARCH_INITIAL_ADMIN_PASSWORD` for Opensearch >= 2.12.0
+- Update default dependencies versions for Magento, Shopware, Wordpress, etc.
+- Better support for Mariadb 11+
+
+## [0.6.6] - 2024-05-14
+
+### Changed
+
+- Enable reward-cloud plugin
+- Fix opensearch-dashboard host
+
+### Fixed
+
+- Minor bug fixes
 
-We're super excited to announce `Reward` 0.6.5!
+## [0.6.5] - 2024-05-10
 
 ### Changed
 

Makefile

@@ -22,10 +22,10 @@ build: ## Build the command to ./dist
 	CGO_ENABLED=0 go build -ldflags="-s -w" -o dist/reward ./cmd/reward/main.go
 
 package: ## Build the binaries and packages using goreleaser (without releasing it)
-	goreleaser --clean --snapshot --skip-publish
+	goreleaser --clean --snapshot
 
 build-local: ## Build the binaries only using goreleaser (without releasing it)
-	goreleaser --clean --snapshot --skip-publish --config .local.goreleaser.yml
+	goreleaser --clean --snapshot --config .local.goreleaser.yml
 
 ## —— Go Commands —————————————————————————————————————————————————————————
 gomod: ## Update Go Dependencies

VERSION.txt

@@ -1 +1 @@
-v0.6.6
+v0.6.7

assets/templates/docker-compose/environments/includes/db.base.yml

@@ -23,7 +23,7 @@ services:
       - {{ default 3306 $.mysql_expose_target }}:3306
 {{- end }}
     command:
-      - mysqld
+      - {{ $.database_executable }}
       - --max_allowed_packet=1024M
       - --explicit_defaults_for_timestamp=on
 {{ if ge 10.5 (float64 $.mariadb_version) }}

assets/templates/docker-compose/environments/includes/opensearch.base.yml

@@ -31,6 +31,9 @@ services:
       - discovery.type=single-node
       - plugins.security.disabled=true
       - "ES_JAVA_OPTS=-Xms{{ default "64m" $.opensearch_xms }} -Xmx{{ default "512m" $.opensearch_xmx }}"
+  {{- if ge ( semver "2.12" | (semver ( default "1.2" $.opensearch_version )).Compare ) 0 }}
+      - OPENSEARCH_INITIAL_ADMIN_PASSWORD={{ $.opensearch_initial_admin_password }}
+  {{- end }}
     volumes:
       - osdata:/usr/share/opensearch/data
 {{- if isEnabled ( default false $.opensearch_expose ) }}

assets/templates/docker-compose/environments/magento2/magento2.splitdb.checkout.base.yml

@@ -27,7 +27,7 @@ services:
       - MYSQL_USER={{ default "magento" $.mysql_user }}
       - MYSQL_PASSWORD={{ default "magento" $.mysql_password }}
     command:
-      - mysqld
+      - {{ $.database_executable }}
       - --max_allowed_packet=1024M
     volumes:
       - checkoutdbdata:/var/lib/mysql

assets/templates/docker-compose/environments/magento2/magento2.splitdb.sales.base.yml

@@ -27,7 +27,7 @@ services:
       - MYSQL_USER={{ default "magento" $.mysql_user }}
       - MYSQL_PASSWORD={{ default "magento" $.mysql_password }}
     command:
-      - mysqld
+      - {{ $.database_executable }}
       - --max_allowed_packet=1024M
     volumes:
       - salesdbdata:/var/lib/mysql

assets/templates/docker-compose/environments/magento2/magento2.tests.base.yml

@@ -13,7 +13,7 @@ services:
       - MYSQL_USER={{ default "magento" $.mysql_user }}
       - MYSQL_PASSWORD={{ default "magento" $.mysql_password }}
     command:
-      - mysqld
+      - {{ $.database_executable }}
       - --max_allowed_packet=1024M
       - --explicit_defaults_for_timestamp=on
     volumes:

assets/templates/docker-compose/environments/shopware/db.base.yml

@@ -26,5 +26,5 @@ services:
     entrypoint: |
       /bin/bash -c '
         echo "$$DB_AUTO_CREATE_SH" > /docker-entrypoint-initdb.d/db-auto-create.sh
-        exec /usr/local/bin/docker-entrypoint.sh mysqld
+        exec /usr/local/bin/docker-entrypoint.sh {{ $.database_executable }}
       '

go.mod

@@ -5,22 +5,23 @@ go 1.22
 require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/Masterminds/sprig/v3 v3.2.3
-	github.com/docker/cli v26.0.0+incompatible
-	github.com/docker/docker v26.0.0+incompatible
-	github.com/hashicorp/go-version v1.6.0
+	github.com/docker/cli v27.0.3+incompatible
+	github.com/docker/docker v27.0.3+incompatible
+	github.com/hashicorp/go-version v1.7.0
 	github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf
-	github.com/jedib0t/go-pretty/v6 v6.5.6
-	github.com/sethvargo/go-password v0.2.0
+	github.com/jedib0t/go-pretty/v6 v6.5.9
+	github.com/pkg/errors v0.9.1
+	github.com/sethvargo/go-password v0.3.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/afero v1.11.0
-	github.com/spf13/cobra v1.8.0
+	github.com/spf13/cobra v1.8.1
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.18.2
+	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.9.0
-	github.com/ulikunitz/xz v0.5.11
-	golang.org/x/crypto v0.21.0
-	golang.org/x/sys v0.18.0
-	golang.org/x/text v0.14.0
+	github.com/ulikunitz/xz v0.5.12
+	golang.org/x/crypto v0.24.0
+	golang.org/x/sys v0.21.0
+	golang.org/x/text v0.16.0
 	gopkg.in/ini.v1 v1.67.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -29,21 +30,22 @@ require (
 	dario.cat/mergo v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.2.1 // indirect
-	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/distribution/reference v0.5.0 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/huandu/xstrings v1.4.0 // indirect
+	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
@@ -56,29 +58,28 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/locafero v0.6.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
-	go.opentelemetry.io/otel v1.24.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
+	go.opentelemetry.io/otel v1.27.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
-	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/metric v1.27.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
-	go.opentelemetry.io/otel/trace v1.24.0 // indirect
+	go.opentelemetry.io/otel/trace v1.27.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
-	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/mod v0.18.0 // indirect
+	golang.org/x/tools v0.22.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gotest.tools/v3 v3.4.0 // indirect
 )